Wed Jun 25 17:06:18 2003 Chris Cleeland <cleeland_c@ociweb.com>

11 files changed, 73 insertions, 46 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c4915ba5e2d..b93ad082ff0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Wed Jun 25 17:06:18 2003  Chris Cleeland  <cleeland_c@ociweb.com>
+
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl: 
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf: 
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf: 
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README: 
+	* orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h: 
+	* orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp: 
+	* orbsvcs/tests/Notify/performance-tests/Throughput/README: 
+	* orbsvcs/tests/Notify/lib/EventChannel_Command.h: 
+	* orbsvcs/tests/Notify/lib/EventChannel_Command.cpp: 
+
+	  Replaced misspelling word "colocated" with correctly spelled
+	  "collocated" throughout these files.  I did not change actual
+	  file or directory names due to potential problems with CVS.
+
+	  The COLOCATED option in TAO_NS_EventChannel_Command::init is
+	  grandfathered in at the moment, but it also prints out a
+	  warning that you're using a deprecated misspelled option.
+
 Wed Jun 25 17:02:03 2003  George Edwards <g.edwards@vanderbilt.edu>
 
         * TAO/tests/OBV/Supports/Client.dsp
@@ -19,14 +39,14 @@ Wed Jun 25 17:02:03 2003  George Edwards <g.edwards@vanderbilt.edu>
 
 Wed Jun 25 17:00:00 2003  Justin Michel  <michel_j@ociweb.com>
 
-    * tao/IORInterceptor/IORInterceptor.mpc:
-    * tao/ObjRefTemplate/ObjRefTemplate.mpc:
-    * tao/PortableServer/PortableServer.mpc:
-    * tao/RTCORBA/Multi_Priority_Mapping.h:
-    * tao/Valuetype/Valuetype.mpc:
+	* tao/IORInterceptor/IORInterceptor.mpc:
+	* tao/ObjRefTemplate/ObjRefTemplate.mpc:
+	* tao/PortableServer/PortableServer.mpc:
+	* tao/RTCORBA/Multi_Priority_Mapping.h:
+	* tao/Valuetype/Valuetype.mpc:
 
-      Fixes for various mpc generation problems. 
-      Incorrect export macro used in the rtcorba header.
+	  Fixes for various mpc generation problems. 
+	  Incorrect export macro used in the rtcorba header.
 
 Wed Jun 25 16:05:50 2003  Chris Cleeland  <cleeland_c@ociweb.com>
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index cc20c12f645..ed167418d38 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(lib, TAO_EventChannel_Command, "$id$")
 #include "../../../orbsvcs/Notify/Service.h"
 
 TAO_NS_EventChannel_Command::TAO_NS_EventChannel_Command (void)
-  : colocated_ (0)
+  : collocated_ (0)
 {
 }
 
@@ -37,7 +37,7 @@ TAO_NS_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
-      if (arg_shifter.cur_arg_strncasecmp ("-Create") == 0) // -Create ec_name factory_name [COLOCATED]
+      if (arg_shifter.cur_arg_strncasecmp ("-Create") == 0) // -Create ec_name factory_name [COLLOCATED]
         {
           this->command_ = CREATE;
 
@@ -49,9 +49,16 @@ TAO_NS_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
           this->factory_ = arg_shifter.get_current ();
           arg_shifter.consume_arg ();
 
-          if (arg_shifter.cur_arg_strncasecmp ("COLOCATED") == 0)
+          if (arg_shifter.cur_arg_strncasecmp ("COLLOCATED") == 0)
             {
-              this->colocated_ = 1;
+              this->collocated_ = 1;
+            }
+
+          if (arg_shifter.cur_arg_strncasecmp ("COLOCATED") == 0) // grandfather in misspelled
+            {
+              this->collocated_ = 1;
+              ACE_DEBUG ((LM_WARNING, "TAO_NS_EventChannel_Command::init --"
+                          " warning: deprecated misspelled COLOCATED option used.\n"));
             }
         }
       else if (arg_shifter.cur_arg_strncasecmp ("-Destroy") == 0) // -Destroy ec_name
@@ -81,7 +88,7 @@ TAO_NS_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
 }
 
 void
-TAO_NS_EventChannel_Command::create_colocated_ecf (ACE_ENV_SINGLE_ARG_DECL)
+TAO_NS_EventChannel_Command::create_collocated_ecf (ACE_ENV_SINGLE_ARG_DECL)
 {
   CosNotifyChannelAdmin::EventChannelFactory_var notify_factory;
 
@@ -136,9 +143,9 @@ TAO_NS_EventChannel_Command::create_colocated_ecf (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_NS_EventChannel_Command::handle_create (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->colocated_ == 1)
+  if (this->collocated_ == 1)
     {
-      this->create_colocated_ecf (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->create_collocated_ecf (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
     }
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 3f2c7720121..3323f380af6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -76,11 +76,11 @@ protected:
 
   CosNotification::AdminProperties admin_;
 
-  /// Flag to tell if the Channel Factory should be colocated.
-  CORBA::Boolean colocated_;
+  /// Flag to tell if the Channel Factory should be collocated.
+  CORBA::Boolean collocated_;
 
-  /// Helper method to create a colocated ECF.
-  void create_colocated_ecf (ACE_ENV_SINGLE_ARG_DECL);
+  /// Helper method to create a collocated ECF.
+  void create_collocated_ecf (ACE_ENV_SINGLE_ARG_DECL);
 
   /// = Handlers
   void handle_create (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/README b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/README
index cd49e10cd8f..3b27b5e847e 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/README
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/README
@@ -5,7 +5,7 @@ Test to measure Notify's throughput
 
 Command line options:
 -------------------- 
--colocated_ec,
+-collocated_ec,
 -consumers [count],
 -suppliers [count],
 -burst_size [size],
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index c721f19c466..b76ce78b76b 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -191,7 +191,7 @@ Throughput_StructuredPushSupplier::svc (void)
 
 /***************************************************************************/
 Notify_Throughput::Notify_Throughput (void)
-  : colocated_ec_ (0),
+  : collocated_ec_ (0),
     burst_count_ (1),
     burst_pause_ (10000),
     burst_size_ (1000),
@@ -335,9 +335,9 @@ Notify_Throughput::parse_args(int argc, char *argv[])
     const ACE_TCHAR* current_arg = 0;
     while (arg_shifter.is_anything_left ())
     {
-      if (arg_shifter.cur_arg_strncasecmp ("-colocated_ec") == 0)
+      if (arg_shifter.cur_arg_strncasecmp ("-collocated_ec") == 0)
         {
-          this->colocated_ec_ = 1;
+          this->collocated_ec_ = 1;
           arg_shifter.consume_arg ();
         }
       else if ((current_arg = arg_shifter.get_the_parameter ("-consumers")))
@@ -396,7 +396,7 @@ Notify_Throughput::parse_args(int argc, char *argv[])
         {
           ACE_DEBUG((LM_DEBUG,
                      "usage: %s "
-                     "-colocated_ec, "
+                     "-collocated_ec, "
                      "-consumers [count], "
                      "-suppliers [count], "
                      "-burst_size [size], "
@@ -424,7 +424,7 @@ Notify_Throughput::parse_args(int argc, char *argv[])
 void
 Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 {
-  if (this->colocated_ec_ == 1)
+  if (this->collocated_ec_ == 1)
     {
       TAO_Notify_Service* notify_service = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NS_NOTIFICATION_SERVICE_NAME);
 
@@ -485,7 +485,7 @@ void
 Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL)
 {
 
-  ACE_DEBUG ((LM_DEBUG, "colocated_ec_ %d ,"
+  ACE_DEBUG ((LM_DEBUG, "collocated_ec_ %d ,"
               "burst_count_ %d, "
               "burst_pause_ %d, "
               "burst_size_  %d, "
@@ -493,7 +493,7 @@ Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL)
               "consumer_count_ %d,  "
               "supplier_count_ %d "
               "expected count %d\n",
-              colocated_ec_,
+              collocated_ec_,
               burst_count_ ,
               burst_pause_ ,
               burst_size_ ,
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index ec5c1f64b88..7129abc1c4b 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -160,8 +160,8 @@ protected:
   void create_EC (ACE_ENV_SINGLE_ARG_DECL);
   // Create participants.
 
-  CORBA::Boolean colocated_ec_;
-  // is the ec colocated.
+  CORBA::Boolean collocated_ec_;
+  // is the ec collocated.
 
   int burst_count_;
   // How many bursts we will send from each supplier.
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
index 336b0ff1186..8debc531edc 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/colocated.conf
@@ -23,7 +23,7 @@ dynamic TAO_NS_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests
 static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
-static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory COLOCATED"
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory COLLOCATED"
 
 ###
 ###  Configure Supplier and Consumer for the High Priority Path
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
index 855fbfb8b14..c02949d6c54 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl
@@ -11,15 +11,15 @@ use PerlACE::Run_Test;
 $experiment_timeout = 600;
 $startup_timeout = 60;
 $naming_ior = PerlACE::LocalFile ("naming.ior");
-$colocated_conf = PerlACE::LocalFile ("colocated.conf");
+$collocated_conf = PerlACE::LocalFile ("colocated.conf");
 $status = 0;
 
 $Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service",
                                 "-o $naming_ior");
 
-$Colocated = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+$Collocated = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
 
-$Colocated_Args = "-ORBInitRef NameService=file://$naming_ior -ORBSvcConf $colocated_conf";
+$Collocated_Args = "-ORBInitRef NameService=file://$naming_ior -ORBSvcConf $collocated_conf";
 
 unlink $naming_ior;
 $Naming->Spawn ();
@@ -30,14 +30,14 @@ if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
   exit 1;
 }
 
-$Colocated->Arguments ($Colocated_Args);
-$args = $Colocated->Arguments ();
-print STDERR "Running Colocated with arguments: $args\n";
+$Collocated->Arguments ($Collocated_Args);
+$args = $Collocated->Arguments ();
+print STDERR "Running Collocated with arguments: $args\n";
 $status = $Colocated->SpawnWaitKill ($experiment_timeout);
 
 if ($status != 0)
   {
-    print STDERR "ERROR: Colocated returned $status\n";
+    print STDERR "ERROR: Collocated returned $status\n";
     $Notification->Kill ();
     $Naming->Kill ();
     exit 1;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
index 51040c059e2..f6f851c7296 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/colocated.conf
@@ -26,7 +26,7 @@ dynamic TAO_NS_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_T
 static Command_Builder "Application -Init"
 
 ##------- Create Event Channel ---------------
-static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory COLOCATED"
+static Command_Builder "EventChannel -Create ec1 NotifyEventChannelFactory COLLOCATED"
 static Command_Builder "EventChannel -Set_QoS ec1 -ThreadPoolLanes 2 -Lane 0 1 0 -Lane 1 1 0"
 
 ##----------- Create an RT POA to host local consumer objects-----------
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
index 855fbfb8b14..c24ea4c7cbe 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl
@@ -11,15 +11,15 @@ use PerlACE::Run_Test;
 $experiment_timeout = 600;
 $startup_timeout = 60;
 $naming_ior = PerlACE::LocalFile ("naming.ior");
-$colocated_conf = PerlACE::LocalFile ("colocated.conf");
+$collocated_conf = PerlACE::LocalFile ("colocated.conf");
 $status = 0;
 
 $Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service",
                                 "-o $naming_ior");
 
-$Colocated = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
+$Collocated = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
 
-$Colocated_Args = "-ORBInitRef NameService=file://$naming_ior -ORBSvcConf $colocated_conf";
+$Collocated_Args = "-ORBInitRef NameService=file://$naming_ior -ORBSvcConf $collocated_conf";
 
 unlink $naming_ior;
 $Naming->Spawn ();
@@ -30,14 +30,14 @@ if (PerlACE::waitforfile_timed ($naming_ior, $startup_timeout) == -1) {
   exit 1;
 }
 
-$Colocated->Arguments ($Colocated_Args);
-$args = $Colocated->Arguments ();
-print STDERR "Running Colocated with arguments: $args\n";
-$status = $Colocated->SpawnWaitKill ($experiment_timeout);
+$Collocated->Arguments ($Collocated_Args);
+$args = $Collocated->Arguments ();
+print STDERR "Running Collocated with arguments: $args\n";
+$status = $Collocated->SpawnWaitKill ($experiment_timeout);
 
 if ($status != 0)
   {
-    print STDERR "ERROR: Colocated returned $status\n";
+    print STDERR "ERROR: Collocated returned $status\n";
     $Notification->Kill ();
     $Naming->Kill ();
     exit 1;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README
index c14aded097d..1bdb2e76d15 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README
@@ -13,7 +13,7 @@ This test runs the following configurations*:
 	       onto the final consummer.
 3. Notify    : A supplier sends events via Cos Notification to a consumer.
 
-4. Colocated : A supplier sends events via a colocated
+4. Collocated: A supplier sends events via a collocated
 	       RT Notification to a consumer.
 
 [* Note that the payload is identical in all configurations.