ChangeLogTag:Thu May 23 12:02:19 2002 Carlos O'Ryan <coryan@atdesk.com>

9 files changed, 35 insertions, 13 deletions

diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index 5bd26a301fa..ae2e59f8e10 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -12,6 +12,7 @@
 #include "Client_Pair.h"
 
 #include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event/EC_Default_Factory.h"
 
 #include "tao/Messaging/Messaging.h"
 #include "tao/Strategies/advanced_resource.h"
@@ -128,6 +129,7 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char *argv[])
 {
+  TAO_EC_Default_Factory::init_svcs();
   RT_Class rt_class;
 
   ACE_TRY_NEW_ENV
@@ -261,7 +263,7 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
                            high_priority_period,
                            0,
                            ACE_ES_EVENT_UNDEFINED,
-                           1,
+                           experiment_id,
                            high_priority_group.supplier (),
                            &barrier);
   {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/parameters b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/parameters
index bc36f6531b7..6a749778a2e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/parameters
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/parameters
@@ -1,9 +1,10 @@
 NTHREADS="16"
 
-NCONSUMERS="32 64 96 128 160 192 224 256 288 320 352 384 416 448 480 512"
+#NCONSUMERS="32 64 96 128 160 192 224 256 288 320 352 384 416 448 480 512"
+NCONSUMERS="2 4 8"
 
-ITERATIONS=25000
-#ITERATIONS=3000
+#ITERATIONS=25000
+ITERATIONS=3000
 
 LOCKING_TYPES="copy_on_read copy_on_write delayed"
 DISPATCHING_TYPES="threaded reactive rtcorba"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf
index b0e36ffb28b..7cc3d800820 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf
@@ -1,2 +1,2 @@
 # $Id$
-static EC_Factory "-ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list"
+static EC_Factory "-ECObserver basic -ECProxyPushConsumerCollection mt:copy_on_write:list -ECProxyPushSupplierCollection mt:copy_on_write:list"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/run_roundtrip.sh b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/run_roundtrip.sh
index bfaa3ec2bc2..f7ea4c46d99 100755
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/run_roundtrip.sh
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/run_roundtrip.sh
@@ -12,13 +12,13 @@ for c in $NCONSUMERS; do
 
   /bin/rm -f $IOR
 # ssh $REMOTE_HOST "cd $REMOTE_LOCATION ; ./server -ORBSvcConf ec.locking_${t}.conf -r -o $IOR" >server.log 2>&1 </dev/null &
-  ./server -o $IOR -i $ITERATIONS -p 2 >server.$c.txt 2>&1 </dev/null &
+  ./server -d -o $IOR -i $ITERATIONS -p 2 >server.$c.txt 2>&1 </dev/null &
   while [ ! -f $IOR ]; do
     sleep 1
   done
-  ./client -ORBSvcConf roundtrip.conf -k file://$IOR -d -z -h 10000 -l 10000 -i $ITERATIONS -c $c > ec_roundtrip.$c.01.txt 2>&1 </dev/null &
+  ./client -ORBDebugLevel 0 -ORBSvcConf roundtrip.conf -k file://$IOR -z -h 10000 -l 10000 > ec_roundtrip.$c.01.txt 2>&1 </dev/null &
 
-  ./client -ORBSvcConf roundtrip.conf -k file://$IOR -d -z -h 10000 -l 10000 -i $ITERATIONS -c $c > ec_roundtrip.$c.02.txt 2>&1 </dev/null &
+  ./client -ORBDebugLevel 0 -ORBSvcConf roundtrip.conf -k file://$IOR -z -h 10000 -l 10000 > ec_roundtrip.$c.02.txt 2>&1 </dev/null &
 
   wait
   wait
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Makefile
index 73acc5cded0..ab4648772e0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Makefile
@@ -14,7 +14,8 @@ DIRS  = \
   RTCORBA_Callback \
   Roundtrip \
   Federated_Roundtrip \
-  Colocated_Roundtrip
+  Colocated_Roundtrip \
+  TCP_Baseline
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
index 1818ca0716e..1d721d1f04d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -12,6 +12,8 @@
 #include "Auto_Functor.h"
 #include "Auto_Disconnect.h"
 
+#include "orbsvcs/Event_Service_Constants.h"
+
 #include "ace/High_Res_Timer.h"
 #include "ace/Sample_History.h"
 #include "ace/Basic_Stats.h"
@@ -93,20 +95,20 @@ Control::join (Federated_Test::Peer_ptr peer
     {
       /// ... automatically release the object references ...
       ACE_Auto_Basic_Array_Ptr<Federated_Test::Loopback_var> loopbacks (
-          new Federated_Test::Loopback_var[this->peers_count_]
+          new Federated_Test::Loopback_var[2*this->peers_count_]
           );
 
       /// ... and automatically disconnect the loopbacks ...
       typedef Auto_Disconnect<Federated_Test::Loopback> Loopback_Disconnect;
       ACE_Auto_Basic_Array_Ptr<auto_ptr<Loopback_Disconnect> > disconnects (
-          new auto_ptr<Loopback_Disconnect>[this->peers_count_]
+          new auto_ptr<Loopback_Disconnect>[2*this->peers_count_]
           );
 
       ACE_DEBUG ((LM_DEBUG,
                   "Control (%P|%t) Running test for peer %d\n",
                   i));
       CORBA::Long experiment_id = 128 + i;
-      CORBA::Long base_event_type = 32;
+      CORBA::Long base_event_type = ACE_ES_EVENT_UNDEFINED;
 
       size_t lcount = 0;
 
@@ -127,6 +129,19 @@ Control::join (Federated_Test::Peer_ptr peer
                                   Loopback_Disconnect
                                  );
               lcount++;
+
+              loopbacks[lcount] =
+                this->peers_[j]->setup_loopback (experiment_id,
+                                                 base_event_type + 2
+                                                 ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+
+              ACE_AUTO_PTR_RESET (disconnects[lcount],
+                                  new Loopback_Disconnect (
+                                        loopbacks[lcount].in ()),
+                                  Loopback_Disconnect
+                                 );
+              lcount++;
             }
         }
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
index ce575dcd439..7bdb98d3fad 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
@@ -84,6 +84,7 @@ Loopback_Supplier::push (const RtecEventComm::EventSet &source
                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  // ACE_DEBUG ((LM_DEBUG, "Loopback_Supplier pushing\n"));
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
index 8e663c4cd45..95cba52845f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -81,7 +81,7 @@ Peer_Base::connect (Federated_Test::Peer_ptr remote_peer
                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n"));
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n"));
   CORBA::Object_var remote_ec_object =
     remote_peer->channel (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
index 0f89a48436a..d6c3307dc82 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
@@ -89,6 +89,8 @@ Supplier::push (const RtecEventComm::EventSet &events
                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  // ACE_DEBUG ((LM_DEBUG, "Supplier pushing (%d,%d)\n",
+  // events[0].header.type, events[0].header.source));
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
     ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);