summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--TAO/ChangeLog28
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp4
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp8
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp8
-rw-r--r--TAO/tao/GIOP_Message_Base.cpp4
-rw-r--r--TAO/tao/GIOP_Message_Lite.cpp4
-rw-r--r--TAO/tao/ORB.cpp4
-rw-r--r--TAO/tao/Strategies/DIOP_Transport.cpp4
-rw-r--r--TAO/tao/TAO_Server_Request.cpp4
-rw-r--r--TAO/tao/Transport.cpp4
-rw-r--r--ace/README7
-rw-r--r--ace/config-lite.h4
13 files changed, 59 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index cc4e72f39ff..b0edf1725d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jun 23 06:52:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/config-lite.h:
+ * ace/README:
+ Changed ACE_HAS_MEMORY_PROFILER to ACE_INITIALIZE_MEMORY_BEFORE_USE.
+ The last says better what we do. This define is then set when
+ running with valgrind or purify. Thanks to Chris Cleeland for
+ the suggestion
+
Tue Jun 22 16:54:35 2004 J.T. Conklin <jtc@acorntoolworks.com>
* configure.ac:
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3a820b6d2a2..5a2bf5e5b37 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,28 +1,44 @@
+Wed Jun 23 06:52:31 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/GIOP_Message_Base.cpp:
+ * tao/GIOP_Message_Lite.cpp:
+ * tao/ORB.cpp:
+ * tao/TAO_Server_Request.cpp:
+ * tao/Transport.cpp:
+ Replaced all checks for ACE_HAS_MEMORY_PROFILER with
+ ACE_INITIALIZE_MEMORY_BEFORE_USE. This covers better what we do.
+
+ * tao/Strategies/DIOP_Transport.cpp:
+ * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp:
+ * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+ Replaced ACE_HAS_PURIFY with ACE_INITIALIZE_MEMORY_BEFORE_USE
+
Tue Jun 22 19:51:36 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * tao/orbconf.h:
+ * tao/orbconf.h:
Removed some of the TAO_ENV* macros. They were supposed to be
deprecated from time immemorial and it was finally time to bid
- adieu.
-
+ adieu.
+
* tao/Any_Unknown_IDL_Type.cpp:
* tao/ORBInitializer_Registry.h:
* tao/ORB_Core.cpp:
* tao/PortableServer/Object_Adapter.cpp:
Strange, our code had a bunch of TAO_ENV* in the cpp
- files. Changed them to the ACE_ENV* equivalents.
+ files. Changed them to the ACE_ENV* equivalents.
Tue Jun 22 11:45:07 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
* orbsvcs/IFR_Service/IFR_Service.mpc:
-
+
Added VPATH statement to the verbatim block of the TAO_IFR_EXE
project. This allows the gnu linker to find object files
built from source files in some directory which is not a
subdirectory of the local one. Thanks to Don Hinton
- <dhinton@dre.vanderbilt.edu> and Bala Natarajan
+ <dhinton@dre.vanderbilt.edu> and Bala Natarajan
<bala@dre.vanderbilt.edu> for their help with this problem.
Tue Jun 22 14:10:31 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index e082b298ea0..bcdd093c8d8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -447,11 +447,11 @@ TAO_UIPMC_Transport::handle_input (TAO_Resume_Handle &rh,
// messages
char buf [MIOP_MAX_DGRAM_SIZE];
-#if defined (ACE_HAS_PURIFY)
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
(void) ACE_OS::memset (buf,
'\0',
sizeof buf);
-#endif /* ACE_HAS_PURIFY */
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
// Create a data block
ACE_Data_Block db (sizeof (buf),
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index 84b91bcda0b..2d0bd749394 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -739,10 +739,10 @@ Cubit_Client::cube_long_sequence (int,
// gets in the way.
input[0] = 4;
-#if defined (ACE_HAS_PURIFY) && (ACE_HAS_PURIFY == 1)
+#if defined (ACE_HAS_MEMORY_PROFILER)
for (int i = 1; i < l; i++)
input[i]=11;
-#endif /* ACE_HAS_PURIFY == 1 */
+#endif /* ACE_HAS_MEMORY_PROFILER */
Cubit::long_seq_var output;
Cubit::long_seq_out vout (output);
@@ -813,10 +813,10 @@ Cubit_Client::cube_octet_sequence (int,
// gets in the way.
input[0] = 4;
-#if defined (ACE_HAS_PURIFY) && (ACE_HAS_PURIFY == 1)
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
for (int i = 1 ; i < l; i++)
input[i]=10;
-#endif /* ACE_HAS_PURIFY == 1 */
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
Cubit::octet_seq_var output;
Cubit::octet_seq_out vout (output);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index b4084ce49df..91a6f4b7df3 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -281,7 +281,7 @@ Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
output->length (input.length ());
-#if defined (ACE_HAS_PURIFY) && (ACE_HAS_PURIFY == 1)
+#if defined (ACE_HAS_MEMORY_PROFILER)
for (CORBA::ULong i = 0; i < input.length (); ++i)
{
CORBA::Long x = input[i];
@@ -291,7 +291,7 @@ Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
CORBA::ULong i = 0;
CORBA::Long x = input[0];
output[i] = x * x * x;
-#endif /* ACE_HAS_PURIFY == 1 */
+#endif /* ACE_HAS_MEMORY_PROFILER */
}
// Cube an octet sequence
@@ -316,7 +316,7 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
output->length (input.length ());
-#if defined (ACE_HAS_PURIFY) && (ACE_HAS_PURIFY == 1)
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
// For Purify, initialize every output since we're looking for
// accesses to uninitialized memory addresses. Performance
// is secondary when compiling for purify.
@@ -333,7 +333,7 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
CORBA::ULong i = 0;
CORBA::Octet x = input[0];
output[i] = x * x * x;
-#endif /* ACE_HAS_PURIFY == 1 */
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
}
void
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index aa68fa2f4b4..45704752f66 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -35,9 +35,9 @@ TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
TAO_DEF_GIOP_MAJOR,
TAO_DEF_GIOP_MINOR)
{
-#if defined (ACE_HAS_MEMORY_PROFILER)
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
ACE_OS::memset(buffer_, 0, sizeof (buffer_));
-#endif /* ACE_HAS_MEMORY_PROFILER */
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
}
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 7f5f546701a..e9cddab3989 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -517,11 +517,11 @@ TAO_GIOP_Message_Lite::process_request_message (TAO_Transport *transport,
// A buffer that we will use to initialise the CDR stream
char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-#if defined(ACE_HAS_MEMORY_PROFILER)
+#if defined(ACE_INITIALIZE_MEMORY_BEFORE_USE)
(void) ACE_OS::memset (repbuf,
'\0',
sizeof repbuf);
-#endif /* ACE_HAS_MEMORY_PROFILER */
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
// Initialze an output CDR on the stack
TAO_OutputCDR output (repbuf,
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 45f972748e0..06e158f02e5 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1723,14 +1723,14 @@ CORBA::ORB::object_to_string (CORBA::Object_ptr obj
// XXX there should be a simple way to reuse this code in other
// ORB implementations ...
-#if defined (ACE_HAS_MEMORY_PROFILER)
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
char buf [ACE_CDR::DEFAULT_BUFSIZE] = { 0 };
#else
// Avoid the initialization overhead if not compiling with
// support for a memory profiler. There is no need to actually perform
// initialization otherwise.
char buf [ACE_CDR::DEFAULT_BUFSIZE];
-#endif /* ACE_HAS_PURIFY */
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
TAO_OutputCDR cdr (buf, sizeof buf,
TAO_ENCAP_BYTE_ORDER,
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index 849240d6b7c..1887f9e3993 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -164,11 +164,11 @@ TAO_DIOP_Transport::handle_input (TAO_Resume_Handle &rh,
// messages
char buf [ACE_MAX_DGRAM_SIZE];
-#if defined (ACE_HAS_PURIFY)
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
(void) ACE_OS::memset (buf,
'\0',
sizeof buf);
-#endif /* ACE_HAS_PURIFY */
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
// Create a data block
ACE_Data_Block db (sizeof (buf),
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 12b7d58ff10..a9820608a3b 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -274,7 +274,7 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
}
// Create a new output CDR stream
-#if defined(ACE_HAS_MEMORY_PROFILER)
+#if defined(ACE_INITIALIZE_MEMORY_BEFORE_USE)
// Only inititialize the buffer if we're compiling with a profiler.
// Otherwise, there is no real need to do so, especially since
// we can avoid the initialization overhead at runtime if we
@@ -282,7 +282,7 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
char repbuf[ACE_CDR::DEFAULT_BUFSIZE] = { 0 };
#else
char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-#endif /* ACE_HAS_MEMORY_PROFILER */
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
TAO_OutputCDR output (repbuf,
sizeof repbuf,
TAO_ENCAP_BYTE_ORDER,
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index b95dc357a2d..10a869f1538 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -1175,11 +1175,11 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh,
// messages
char buf [TAO_MAXBUFSIZE];
-#if defined (ACE_HAS_MEMORY_PROFILER)
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
(void) ACE_OS::memset (buf,
'\0',
sizeof buf);
-#endif /* ACE_HAS_MEMORY_PROFILER */
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
// Create a data block
ACE_Data_Block db (sizeof (buf),
diff --git a/ace/README b/ace/README
index a73dc6dda6d..e2f29f64cf0 100644
--- a/ace/README
+++ b/ace/README
@@ -386,8 +386,6 @@ ACE_HAS_LONG_MAP_FAILED Platform defines MAP_FAILED as
ACE_HAS_MALLOC_STATS Enabled malloc statistics
collection.
ACE_HAS_MEMCHR Use native implementation of memchr.
-ACE_HAS_MEMORY_PROFILER We are using a memory profiler like
- purify or valgrind
ACE_HAS_MINIMAL_ACE_OS Disables some #includes in ace/OS.*.
ACE_HAS_MFC Platform supports Microsoft
Foundation Classes
@@ -668,7 +666,7 @@ ACE_HAS_VERBOSE_NOTSUP Prints out console message in
tracking down origin of
ACE_NOTSUP.
ACE_HAS_VOIDPTR_GETTIMEOFDAY Platform/compiler supports
- void * as second parameter
+ void * as second parameter
to gettimeofday
ACE_HAS_VOIDPTR_MMAP Platform requires void * for
mmap().
@@ -689,6 +687,9 @@ ACE_HAS_XTI Platform has XTI
of TLI). Implies ACE_HAS_TLI
but uses a different header
file.
+ACE_INITIALIZE_MEMORY_BEFORE_USE Memory is explicitly initialized before
+ use. Useful when using a profiler like
+ purify or valgrind
ACE_LACKS_ACCESS Platform lacks access() (e.g.,
VxWorks and Chorus)
ACE_LACKS_ACE_IOSTREAM Platform can not build
diff --git a/ace/config-lite.h b/ace/config-lite.h
index b9d772ec069..ee419eff3b4 100644
--- a/ace/config-lite.h
+++ b/ace/config-lite.h
@@ -75,11 +75,11 @@
# endif /* ACE_MT_SAFE */
# if defined (ACE_HAS_PURIFY)
-# define ACE_HAS_MEMORY_PROFILER
+# define ACE_INITIALIZE_MEMORY_BEFORE_USE
# endif /* ACE_HAS_PURIFY */
# if defined (ACE_HAS_VALGRIND)
-# define ACE_HAS_MEMORY_PROFILER
+# define ACE_INITIALIZE_MEMORY_BEFORE_USE
# endif /* ACE_HAS_VALGRIND */
# if defined (ACE_HAS_USING_KEYWORD)
View Lorry Controller Status