ChangeLogTag: Wed Mar 28 09:31:54 2001 Frank Hunleth <fhunleth@cs.wustl.edu>

3 files changed, 90 insertions, 45 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index a455fef7699..08d126b25db 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,40 +1,50 @@
 Wed Mar 28 09:31:54 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
-	
-	* tests/RTCORBA/Client_Propagated/Client_ORBInitializer.{cpp,h}:
-	* tests/RTCORBA/Client_Propagated/Makefile:
-	* tests/RTCORBA/Client_Propagated/client.dsp:
-	* tests/RTCORBA/Client_Propagated/client.cpp:
-	* tests/RTCORBA/Client_Propagated/interceptors.{cpp,h}:
-	  Added portable interceptor code to verify that the client
-	  propagated priority is passed in the service context list
-	  back from the server.
-
-	* tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp:
-	  Added Ossama's changes to replicate Bug #806.  Also added many 
-	  checks to verify the functionality of the service context 
-	  manipulation methods for requests and replies, and added checks 
-	  to verify that proper service context list contents are received 
-	  from both the client and the server.  The test no longer relies 
-	  on visual inspection of the results to show proper execution.
-
-	* tao/ClientRequestInfo.{cpp,h}:
-	* tao/GIOP_Message_Base.cpp:
-	* tao/GIOP_Message_Generator_Parser_10.cpp:
-	* tao/GIOP_Message_Generator_Parser_12.cpp:
-	* tao/GIOP_Message_Handler.cpp:
-	* tao/GIOP_Message_Lite.cpp:
-	* tao/IIOP_Transport.cpp:
-	* tao/Invocation.{cpp,h,i}:
-	* tao/RT_Protocols_Hooks.cpp:
-	* tao/Service_Context.{cpp,h}:
-	* tao/TAO_Server_Request.{cpp,h,i}:
-	* tao/operation_details.{h,i}:
-	* tao/PortableServer/Object_Adapter.{cpp,h}:
-	* tao/PortableServer/ServerRequestInfo.{cpp,h}:
-	  Separated out request and reply service context lists to fix 
-	  Bug #806.  Refactored out code duplication in 
-	  ClientRequestInfo.{cpp,h} and ServerRequestInfo.{cpp,h} 
-	  using the TAO_Service_Context class.
+
+        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp:
+          Added #if ACE_HAS_PURIFY == 1 checks to initialize some
+          structures before they are used.  This just removes the
+          100,000+ warnings with Purify that the cubit clients and
+          servers give.  This should be ok since any performance
+          measurements have ACE_HAS_PURIFY == 0 anyway.
+
+Wed Mar 28 09:31:54 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
+
+        * tests/RTCORBA/Client_Propagated/Client_ORBInitializer.{cpp,h}:
+        * tests/RTCORBA/Client_Propagated/Makefile:
+        * tests/RTCORBA/Client_Propagated/client.dsp:
+        * tests/RTCORBA/Client_Propagated/client.cpp:
+        * tests/RTCORBA/Client_Propagated/interceptors.{cpp,h}:
+          Added portable interceptor code to verify that the client
+          propagated priority is passed in the service context list
+          back from the server.
+
+        * tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp:
+          Added Ossama's changes to replicate Bug #806.  Also added many
+          checks to verify the functionality of the service context
+          manipulation methods for requests and replies, and added checks
+          to verify that proper service context list contents are received
+          from both the client and the server.  The test no longer relies
+          on visual inspection of the results to show proper execution.
+
+        * tao/ClientRequestInfo.{cpp,h}:
+        * tao/GIOP_Message_Base.cpp:
+        * tao/GIOP_Message_Generator_Parser_10.cpp:
+        * tao/GIOP_Message_Generator_Parser_12.cpp:
+        * tao/GIOP_Message_Handler.cpp:
+        * tao/GIOP_Message_Lite.cpp:
+        * tao/IIOP_Transport.cpp:
+        * tao/Invocation.{cpp,h,i}:
+        * tao/RT_Protocols_Hooks.cpp:
+        * tao/Service_Context.{cpp,h}:
+        * tao/TAO_Server_Request.{cpp,h,i}:
+        * tao/operation_details.{h,i}:
+        * tao/PortableServer/Object_Adapter.{cpp,h}:
+        * tao/PortableServer/ServerRequestInfo.{cpp,h}:
+          Separated out request and reply service context lists to fix
+          Bug #806.  Refactored out code duplication in
+          ClientRequestInfo.{cpp,h} and ServerRequestInfo.{cpp,h}
+          using the TAO_Service_Context class.
 
 Wed Mar 28 08:18:00 2001  Craig Rodrigues <crodrigu@bbn.com>
 
@@ -774,14 +784,14 @@ Sun Mar 25 11:17:40 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 Sun Mar 25 08:52:48 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
         * orbsvcs/orbsvcs/Makefile.RTSched:
-	  Added guards for old g++.
+          Added guards for old g++.
 
         * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp:
         * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h:
         * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
         * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h:
-	  Removed redundant guards  in the files. This should fix a small
-	  compilation problem in LYNX-I386 builds.
+          Removed redundant guards  in the files. This should fix a small
+          compilation problem in LYNX-I386 builds.
 
 Sun Mar 25 07:42:44 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
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 c0bfb09ba5d..5ab7e10e59e 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -742,6 +742,11 @@ Cubit_Client::cube_long_sequence (int,
       // gets in the way.
       input[0] = 4;
 
+#if (ACE_HAS_PURIFY == 1)
+      for(int i=1;i<l;i++)
+        input[i]=11;
+#endif /* ACE_HAS_PURIFY == 1 */
+
       Cubit::long_seq_var output;
       Cubit::long_seq_out vout (output);
 
@@ -811,6 +816,11 @@ Cubit_Client::cube_octet_sequence (int,
       // gets in the way.
       input[0] = 4;
 
+#if (ACE_HAS_PURIFY == 1)
+      for(int i=1;i<l;i++)
+        input[i]=10;
+#endif /* ACE_HAS_PURIFY == 1 */
+
       Cubit::octet_seq_var output;
       Cubit::octet_seq_out vout (output);
 
@@ -883,6 +893,16 @@ Cubit_Client::cube_many_sequence (int,
       in.s = 5;
       in.o = 6;
 
+#if (ACE_HAS_PURIFY == 1)
+      for(int i=1;i<l;i++)
+        {
+          Cubit::Many &inb = input[i];
+          inb.l=7;
+          inb.s=8;
+          inb.o=9;
+        }
+#endif /* ACE_HAS_PURIFY == 1 */
+
       Cubit::many_seq_var output;
       Cubit::many_seq_out vout (output);
 
@@ -957,7 +977,13 @@ Cubit_Client::cube_rti_data (int,
 
       for (int j = 0; j < numUpdates; ++j)
         {
+#if (ACE_HAS_PURIFY == 1)
+          Cubit::RtiObjectUpdateMessageHeader o;
+          ACE_OS::memset (&o, 0, sizeof(Cubit::RtiObjectUpdateMessageHeader));
+          input.msgs[j].oumh (o);
+#else
           input.msgs[j].oumh (Cubit::RtiObjectUpdateMessageHeader ());
+#endif /* ACE_HAS_PURIFY == 1 */
           Cubit::RtiObjectUpdateMessageHeader & oumh = input.msgs[j].oumh ();
           oumh.updateLength = 2001; // redundant
           oumh.updateTag = 2002;
@@ -974,7 +1000,13 @@ Cubit_Client::cube_rti_data (int,
 
           for (int k = 0; k < numAttrs; ++k)
             {
+#if (ACE_HAS_PURIFY == 1)
+              Cubit::HandleValuePair h;
+              ACE_OS::memset (&h, 0, sizeof(Cubit::HandleValuePair));
+              oumh.messagePayload[k] = h;
+#else
               oumh.messagePayload[k] = Cubit::HandleValuePair ();
+#endif /* ACE_HAS_PURIFY == 1 */
               Cubit::HandleValuePair &hvp = oumh.messagePayload[k];
               hvp.handle = k * k;
               const char *d1 = "somedata";
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 91ad25fbc62..73897ae501b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -284,7 +284,7 @@ Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
 
   output->length (input.length ());
 
-#if 0
+#if (ACE_HAS_PURIFY == 1)
   for (CORBA::ULong i = 0; i < input.length (); ++i)
     {
       CORBA::Long x = input[i];
@@ -294,7 +294,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
+#endif /* ACE_HAS_PURIFY == 1 */
 }
 
 // Cube an octet sequence
@@ -319,7 +319,10 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
 
   output->length (input.length ());
 
-#if 0
+#if (ACE_HAS_PURIFY == 1)
+  // For Purify, initialize every output since we're looking for
+  // accesses to uninitialized memory addresses.  Performance
+  // is secondary when compiling for purify.
   for (CORBA::ULong i = 0; i < input.length (); ++i)
     {
       CORBA::Octet x = input[i];
@@ -333,7 +336,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
+#endif /* ACE_HAS_PURIFY == 1 */
 }
 
 void
@@ -349,7 +352,7 @@ Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
 
   output->length (input.length ());
 
-#if 0
+#if (ACE_HAS_PURIFY == 1)
   for (CORBA::ULong i = 0; i < input.length (); ++i)
     {
       const Cubit::Many &in = input[i];
@@ -367,7 +370,7 @@ Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
   out.o = in.o * in.o * in.o;
   out.s = in.s * in.s * in.s;
   out.l = in.l * in.l * in.l;
-#endif
+#endif /* ACE_HAS_PURIFY == 1 */
 }
 
 void