ChangeLogTag: Mon Jul 14 18:41:29 2003 Pradeep Gore <pradeep@oomworks.com>

6 files changed, 24 insertions, 68 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 071883e78a8..7f09a57336b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Mon Jul 14 18:41:29 2003  Pradeep Gore  <pradeep@oomworks.com>
+
+	* orbsvcs/orbsvcs/Notify_Service.cpp:
+
+	  Fixed a typo in a debug message.
+
+	* orbsvcs/tests/Notify/lib/Direct_Consumer.cpp:
+
+	  Removed unnecessary debug messages.
+
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf:
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl:
+	* orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf:
+
+	  Fixed this test to use Direct consumer instead of Relay. removed
+	  the relay.conf file as it is not required.
+
 Mon Jul 14 14:35:00 2003  Justin Michel <michel_j@ociweb.com>
 
         * examples/RTCORBA/Activity/Makefile:
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 4a81122f138..3cf6f059d80 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -470,7 +470,7 @@ Worker::svc (void)
       return -1;
     }
 
-  ACE_DEBUG ((LM_ERROR, "Activated Worker Thread to tun the ORB @ priority:%d \n", priority));
+  ACE_DEBUG ((LM_ERROR, "Activated Worker Thread to run the ORB @ priority:%d \n", priority));
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
index fa99737c9ac..0c6d328b5b1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp
@@ -17,8 +17,6 @@ TAO_Notify_Tests_Direct_Consumer::~TAO_Notify_Tests_Direct_Consumer ()
 void
 TAO_Notify_Tests_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
 {
-  ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Tests_Direct_Consumer::connect resolving poa %s\n",
-              this->poa_name_.c_str ()));
   // Get the POA
   PortableServer::POA_var poa;
   LOOKUP_MANAGER->resolve (poa, this->poa_name_.c_str () ACE_ENV_ARG_PARAMETER);
@@ -28,8 +26,6 @@ TAO_Notify_Tests_Direct_Consumer::connect (ACE_ENV_SINGLE_ARG_DECL)
   this->set_poa (poa.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Tests_Direct_Consumer::connect - _this\n"));
-
   // Activate the consumer with the default_POA_.
   CosNotifyComm::StructuredPushConsumer_var consumer_ref =
     this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf
deleted file mode 100644
index 7aa46580585..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/relay.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-## $Id$
-##---- Load the Factories------
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping continuous"
-
-dynamic TAO_Notify_Tests_RT_Application_Command_Factory Service_Object * TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_Application_Command_Factory () ""
-##dynamic TAO_Notify_Tests_Application_Command_Factory Service_Object * TAO_NotifyTests:_make_TAO_Notify_Tests_Application_Command_Factory () ""
-dynamic TAO_Notify_Tests_ConsumerAdmin_Command_Factory Service_Object *TAO_NotifyTests:_make_TAO_Notify_Tests_ConsumerAdmin_Command_Factory () ""
-
-dynamic TAO_Notify_Tests_Periodic_Consumer_Command_Factory Service_Object* TAO_NotifyTests:_make_TAO_Notify_Tests_Periodic_Consumer_Command_Factory () ""
-
-dynamic TAO_Notify_Tests_RT_POA_Command_Factory Service_Object* TAO_RT_NotifyTests:_make_TAO_Notify_Tests_RT_POA_Command_Factory () ""
-
-##------- Init the Application Object ----------
-static Command_Builder "Application -Init"
-
-##----------- Create an RT POA to host local consumer objects-----------
-static Command_Builder "POA -Create poa_1 -PriorityModel CLIENT 1 -Lanes 4 -Lane 1 1 0 -Lane 20 1 0 -Lane 60 1 0 -Lane 90 1 0"
-
-
-##--------- Consumer 1 , connected to CA 1 --------
-#static Command_Builder "PeriodicConsumer -Create c_low_relay -Relay c_low -POA poa_1"
-
-##--------- Consumer 2 , connected to CA 1 --------
-#static Command_Builder "PeriodicConsumer -Create c_med_relay -Relay c_med -POA poa_1"
-
-##--------- Consumer 3 , connected to CA 1 --------
-static Command_Builder "PeriodicConsumer -Create c_high_relay -Relay c_high -POA poa_1"
-
-##------- Run---------
-static Command_Builder "Application -WaitToStart"
-static Command_Builder "Application -SignalPeer"
-static Command_Builder "Application -Run"
-static Command_Builder "Application -WaitForEvents"
-static Command_Builder "Application -DumpStats"
-static Command_Builder "Application -Shutdown"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
index eeb28c2504b..d9eb350d2e9 100755
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl
@@ -9,16 +9,12 @@ use lib "../../../../../../../../bin";
 use PerlACE::Run_Test;
 use File::Copy;
 
-$experiment_timeout = 60;
-$startup_timeout = 60;
+$experiment_timeout = 600;
+$startup_timeout = 600;
 $naming_ior = PerlACE::LocalFile ("naming.ior");
 $consumer_ior = PerlACE::LocalFile ("consumer.ior");
-$relay_ior = PerlACE::LocalFile ("relay.ior");
-
 $supplier_conf = PerlACE::LocalFile ("supplier.conf");
 $consumer_conf = PerlACE::LocalFile ("consumer.conf");
-$relay_conf = PerlACE::LocalFile ("relay.conf");
-
 $status = 0;
 
 $Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service",
@@ -26,16 +22,13 @@ $Naming = new PerlACE::Process ("../../../../../../Naming_Service/Naming_Service
 
 $Supplier = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
 
-$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$relay_ior -ORBSvcConf $supplier_conf";
+$Supplier_Args = "-ORBInitRef NameService=file://$naming_ior -IORinput file://$consumer_ior -ORBSvcConf $supplier_conf";
 
 $Consumer = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
 
+#$Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $consumer_ior -ORBSvcConf $consumer_conf -ORBDebugLevel 1";
 $Consumer_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $consumer_ior -ORBSvcConf $consumer_conf";
 
-$Relay = new PerlACE::Process ("../../../../Driver/Notify_Tests_Driver");
-
-$Relay_Args = "-ORBInitRef NameService=file://$naming_ior -IORoutput $relay_ior -IORinput file://$consumer_ior -ORBSvcConf $relay_conf";
-
 unlink $naming_ior;
 $Naming->Spawn ();
 
@@ -57,19 +50,6 @@ if (PerlACE::waitforfile_timed ($consumer_ior, $startup_timeout) == -1) {
   exit 1;
 }
 
-unlink $relay_ior;
-$Relay->Arguments ($Relay_Args);
-$args = $Relay->Arguments ();
-print STDERR "Running Relay with arguments: $args\n";
-$status = $Relay->Spawn ();
-
-if (PerlACE::waitforfile_timed ($relay_ior, $startup_timeout) == -1) {
-  print STDERR "ERROR: waiting for the Relay to start\n";
-  $Consumer->Kill ();
-  $Naming->Kill ();
-  exit 1;
-}
-
 $Supplier->Arguments ($Supplier_Args);
 $args = $Supplier->Arguments ();
 print STDERR "Running Supplier with arguments: $args\n";
@@ -84,11 +64,9 @@ if ($status != 0)
     exit 1;
   }
 
-$Consumer->Wait ();
-$Relay->Kill ();
 
+$Consumer->Wait ();
 unlink $consumer_ior;
-unlink $relay_ior;
 
 $Naming->Kill ();
 unlink $naming_ior;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf
index 90565f43675..33770a83a3a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/supplier.conf
@@ -15,7 +15,7 @@ dynamic TAO_Notify_Tests_Periodic_Supplier_Command_Factory Service_Object* TAO_N
 static Command_Builder "Application -Init"
 
 ### --- Create Supplier connected to sa1 ----
-static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high_relay -EventType H -Priority 1 -Period 0 -Iter 50000 -Load 0 -RunTime 15"
+static Command_Builder "PeriodicSupplier -Create s_high -Direct c_high -EventType H -Priority 1 -Period 0 -Iter 50000 -Load 0 -RunTime 15"
 
 ##--------- Run -------------
 static Command_Builder "Application -SignalPeer"