Wed Jul 11 16:03:58 2001 Paul Calabrese <calabrese_p@ociweb.com>

8 files changed, 13 insertions, 9 deletions

diff --git a/TAO/performance-tests/Callback/Makefile b/TAO/performance-tests/Callback/Makefile
index ef142542fa2..1c8b0d0a0e0 100644
--- a/TAO/performance-tests/Callback/Makefile
+++ b/TAO/performance-tests/Callback/Makefile
@@ -12,8 +12,6 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO_PortableServer -lTAO
-
 IDL_FILES = callback
 IDL_SRC = callbackC.cpp callbackS.cpp
 BIN_UNCHECKED = client server
@@ -52,6 +50,8 @@ include $(TAO_ROOT)/taoconfig.mk
 
 .PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
 
+TAO_SRVR_LIBS := -lTAO_Strategies $(TAO_SRVR_LIBS)
+
 client: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK)
 
diff --git a/TAO/performance-tests/Callback/client.bor b/TAO/performance-tests/Callback/client.bor
index 6b9140a0e07..70d60192612 100644
--- a/TAO/performance-tests/Callback/client.bor
+++ b/TAO/performance-tests/Callback/client.bor
@@ -20,7 +20,8 @@ CFLAGS = \
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_PORTABLESERVER_LIB)
+	$(TAO_PORTABLESERVER_LIB) \
+	$(TAO_STRATEGIES_LIB)
 
 IDLFILES = \
         $(IDLDIR)\callback.idl
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index ee02f6c0a05..586838059e6 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -4,6 +4,7 @@
 
 #include "tao/Messaging.h"
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/Strategies/advanced_resource.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Get_Opt.h"
 #include "ace/Basic_Stats.h"
diff --git a/TAO/performance-tests/Callback/client.dsp b/TAO/performance-tests/Callback/client.dsp
index e33eee1403f..65933e755d8 100644
--- a/TAO/performance-tests/Callback/client.dsp
+++ b/TAO/performance-tests/Callback/client.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

+# ADD LINK32 TAO_PortableServer.lib TAO_Strategies.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

 

 !ELSEIF  "$(CFG)" == "Callback Tests Client - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

 

 !ENDIF 

 

diff --git a/TAO/performance-tests/Callback/server.bor b/TAO/performance-tests/Callback/server.bor
index 9bf00e5e335..bafe8d6f3d8 100644
--- a/TAO/performance-tests/Callback/server.bor
+++ b/TAO/performance-tests/Callback/server.bor
@@ -21,7 +21,8 @@ CFLAGS = \
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_PORTABLESERVER_LIB)
+	$(TAO_PORTABLESERVER_LIB) \
+	$(TAO_STRATEGIES_LIB)
 
 IDLFILES = \
         $(IDLDIR)\callback.idl
diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp
index 9b5f8438865..a9beeb5e404 100644
--- a/TAO/performance-tests/Callback/server.cpp
+++ b/TAO/performance-tests/Callback/server.cpp
@@ -3,6 +3,7 @@
 #include "Server_i.h"
 
 #include "tao/Messaging.h"
+#include "tao/Strategies/advanced_resource.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
 
diff --git a/TAO/performance-tests/Callback/server.dsp b/TAO/performance-tests/Callback/server.dsp
index 60469227d9a..69d31b7e0b7 100644
--- a/TAO/performance-tests/Callback/server.dsp
+++ b/TAO/performance-tests/Callback/server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

+# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

 

 !ELSEIF  "$(CFG)" == "Callback Tests Server - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

 

 !ENDIF 

 

diff --git a/TAO/performance-tests/Callback/svc.conf b/TAO/performance-tests/Callback/svc.conf
index 3b651f97a9e..7548f5c5155 100644
--- a/TAO/performance-tests/Callback/svc.conf
+++ b/TAO/performance-tests/Callback/svc.conf
@@ -1,4 +1,4 @@
 # $Id$
 #
-static Resource_Factory "-ORBReactorType mt"
+static Advanced_Resource_Factory "-ORBReactorType select_mt"
 static Client_Strategy_Factory "-ORBClientConnectionHandler RW"