ChangeLogTag: Fri Nov 10 12:06:42 2000 Priyanka Gontla <pgontla@ece.uci.edu>

8 files changed, 37 insertions, 36 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 289be34343a..c0b6d82697e 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Fri Nov 10 12:06:42 2000  Priyanka Gontla  <pgontla@ece.uci.edu>
+
+	* performance-tests/Latency/Makefile : 
+	* performance-tests/Latency/st_client.conf: 
+	* performance-tests/Latency/client-st-exclusive.conf: 
+	* performance-tests/Latency/client-mt-exclusive.conf: 
+	* performance-tests/Latency/st_server.conf: 
+	  Linked TAO_Startegies and dynamically loaded the Advanced
+	  Resource Factory in the service conf files.
+	
 Fri Nov 10 11:54:11 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * tests/NestedUpcall/Simple/client.cpp:
@@ -11,7 +21,7 @@ Fri Nov 10 12:49:51 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 
 Fri Nov 10 10:14:50 2000  Priyanka Gontla <pgontla@ece.uci.edu>
 
-    	* TAO/tests/RTCORBA/server_protocol/run_test.pl
+      	* TAO/tests/RTCORBA/server_protocol/run_test.pl
 	  Modified the options to not load UIOP and SHMIOP in the case 
           where no config file is used.
 
diff --git a/TAO/performance-tests/Latency/Makefile b/TAO/performance-tests/Latency/Makefile
index 820d1faed72..0b6ec4b59fa 100644
--- a/TAO/performance-tests/Latency/Makefile
+++ b/TAO/performance-tests/Latency/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO
+LDLIBS =  -lTAO_Strategies -lTAO
 
 IDL_FILES = test
 IDL_SRC = testC.cpp testS.cpp
@@ -109,8 +109,7 @@ realclean: clean
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -275,8 +274,7 @@ realclean: clean
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- testC.h \
+ $(ACE_ROOT)/ace/Sched_Params.i testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -451,8 +449,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Asynch_Invocation.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- testC.i
+ $(TAO_ROOT)/tao/Asynch_Invocation.i testC.i
 
 .obj/st_client.o .obj/st_client.so .shobj/st_client.o .shobj/st_client.so: st_client.cpp testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -775,8 +772,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Asynch_Invocation.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- testC.i \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i testC.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -880,8 +876,7 @@ realclean: clean
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- testC.h \
+ $(ACE_ROOT)/ace/Sched_Params.i testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -1122,8 +1117,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Asynch_Invocation.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- testC.i \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i testC.i \
  $(TAO_ROOT)/tao/DynamicInterface/Request.h \
  $(TAO_ROOT)/tao/DynamicInterface/Context.h \
  $(TAO_ROOT)/tao/DynamicInterface/dynamicinterface_export.h \
@@ -1328,8 +1322,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- testC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -1687,8 +1680,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- testC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -2036,8 +2028,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- testC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -2506,8 +2497,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Asynch_Invocation.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- testC.i
+ $(TAO_ROOT)/tao/Asynch_Invocation.i testC.i
 
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h \
  $(TAO_ROOT)/tao/PortableServer/MessagingS.h \
@@ -2705,8 +2695,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- testC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -3041,8 +3030,7 @@ realclean: clean
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- testS.h \
+ $(ACE_ROOT)/ace/Sched_Params.i testS.h \
  $(TAO_ROOT)/tao/PortableServer/MessagingS.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -3151,8 +3139,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- testC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -3407,8 +3394,7 @@ realclean: clean
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- testS.h \
+ $(ACE_ROOT)/ace/Sched_Params.i testS.h \
  $(TAO_ROOT)/tao/PortableServer/MessagingS.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
@@ -3517,8 +3503,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- testC.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
diff --git a/TAO/performance-tests/Latency/client-mt-exclusive.conf b/TAO/performance-tests/Latency/client-mt-exclusive.conf
index 2a75162271c..dc02e112fc3 100644
--- a/TAO/performance-tests/Latency/client-mt-exclusive.conf
+++ b/TAO/performance-tests/Latency/client-mt-exclusive.conf
@@ -1,2 +1,3 @@
 # $Id$
 static Client_Strategy_Factory "-ORBclientconnectionhandler MT"
+dynamic Resource_Factory Service_Object *TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
diff --git a/TAO/performance-tests/Latency/client-st-exclusive.conf b/TAO/performance-tests/Latency/client-st-exclusive.conf
index 9a6166dfbb3..64ba84faf25 100644
--- a/TAO/performance-tests/Latency/client-st-exclusive.conf
+++ b/TAO/performance-tests/Latency/client-st-exclusive.conf
@@ -1,4 +1,5 @@
 # $Id$
-static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
+static Resource_Factory "-ORBResources global -ORBInputCDRAllocator null"
+dynamic Resource_Factory Service_Object *TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_st"
 static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST"
 
diff --git a/TAO/performance-tests/Latency/client-st-muxed.conf b/TAO/performance-tests/Latency/client-st-muxed.conf
index b5bfc65d58c..7e636b8cee6 100644
--- a/TAO/performance-tests/Latency/client-st-muxed.conf
+++ b/TAO/performance-tests/Latency/client-st-muxed.conf
@@ -1,5 +1,6 @@
 # $Id$
-static Resource_Factory "-ORBResources global -ORBReactorType select_mt -ORBInputCDRAllocator null"
+static Resource_Factory "-ORBResources global -ORBInputCDRAllocator null"
+dynamic Resource_Factory Service_Object *TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt"
 static Client_Strategy_Factory "-ORBClientConnectionHandler MT -ORBTransportMuxStrategy MUXED"
 
 
diff --git a/TAO/performance-tests/Latency/client.cpp b/TAO/performance-tests/Latency/client.cpp
index 72bd81ed27a..8097757643b 100644
--- a/TAO/performance-tests/Latency/client.cpp
+++ b/TAO/performance-tests/Latency/client.cpp
@@ -141,6 +141,7 @@ main (int argc, char *argv[])
 
       Client* client;
       ACE_NEW_RETURN (client, Client[nthreads], 1);
+
       for (int i = 0; i != nthreads; ++i)
         {
           client[i].set (server.in (), niterations);
diff --git a/TAO/performance-tests/Latency/st_client.conf b/TAO/performance-tests/Latency/st_client.conf
index b846f12ee3d..903e43f7024 100644
--- a/TAO/performance-tests/Latency/st_client.conf
+++ b/TAO/performance-tests/Latency/st_client.conf
@@ -3,5 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBresources global -ORBReactorType select_st -ORBInputCDRAllocator null"
+static Resource_Factory "-ORBresources global -ORBInputCDRAllocator null"
+dynamic Resource_Factory Service_Object *TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_st"
 static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
diff --git a/TAO/performance-tests/Latency/st_server.conf b/TAO/performance-tests/Latency/st_server.conf
index 1a121075eca..caa72e13ff1 100644
--- a/TAO/performance-tests/Latency/st_server.conf
+++ b/TAO/performance-tests/Latency/st_server.conf
@@ -1,4 +1,5 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global -ORBReactorType select_st -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null"
+static Resource_Factory "-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null"
+dynamic Resource_Factory Service_Object *TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_st"
 static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"