ChangeLogTag:Mon Jun 09 15:34:57 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

5 files changed, 21 insertions, 7 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index cea5669627c..72f98e76a7a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Mon Jun 09 15:34:57 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* performance-tests/Latency/Single_Threaded/svc.conf.xml: 
+	* performance-tests/Latency/Single_Threaded/svc.conf: Removed the
+	  deprecated -ORBResources option.
+
+	* performance-tests/Latency/Single_Threaded/client.dsp:
+	* performance-tests/Latency/Single_Threaded/server.dsp: Removed
+	  extraneous library inclusions on the link line. Removed the -GC
+	  option while invoking the IDL compiler. Other than being
+	  inconsistent, doing exraneous things skews up displayed results
+	  from tools like quantify which creates a hurdle when one is
+	  doing performance analysis.
+
 Mon Jun  9 14:38:44 2003  Gan Deng  <dengg@dre.vanderbilt.edu>
 
 	* performance-tests/Sequence_Latency/Single_Threaded/client.cpp:
diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.dsp b/TAO/performance-tests/Latency/Single_Threaded/client.dsp
index e606e1a9e67..bbc0d2a2f76 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/client.dsp
+++ b/TAO/performance-tests/Latency/Single_Threaded/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.lib ace.lib TAO_Strategies.lib TAO_Messaging.lib TAO_Valuetype.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../../ace" /libpath:"../../../tao" /libpath:"../../../tao/Strategies" /libpath:"../../../tao/Messaging" /libpath:"../../../tao/Valuetype"

+# ADD LINK32 TAO.lib ace.lib TAO_Strategies.lib TAO_Valuetype.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../../ace" /libpath:"../../../tao" /libpath:"../../../tao/Strategies" /libpath:"../../../tao/Messaging" /libpath:"../../../tao/Valuetype"

 

 !ELSEIF  "$(CFG)" == "Single_Threaded_Latency 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 TAOd.lib aced.lib TAO_Strategiesd.lib TAO_Messagingd.lib TAO_Valuetyped.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../ace" /libpath:"../../../tao" /libpath:"../../../tao/Strategies" /libpath:"../../../tao/Messaging" /libpath:"../../../tao/Valuetype"

+# ADD LINK32 TAOd.lib aced.lib TAO_Strategiesd.lib  TAO_Valuetyped.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../ace" /libpath:"../../../tao" /libpath:"../../../tao/Strategies" /libpath:"../../../tao/Messaging" /libpath:"../../../tao/Valuetype"

 

 !ENDIF 

 

@@ -164,7 +164,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1  $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.dsp b/TAO/performance-tests/Latency/Single_Threaded/server.dsp
index 57fdea63767..a8bfedaa3e4 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/server.dsp
+++ b/TAO/performance-tests/Latency/Single_Threaded/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_PortableServer.lib TAO.lib ace.lib TAO_Strategies.lib TAO_Messaging.lib TAO_Valuetype.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../tao/PortableServer" /libpath:"../../../../ace" /libpath:"../../../tao" /libpath:"../../../tao/Strategies" /libpath:"../../../tao/Messaging" /libpath:"../../../tao/Valuetype"

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

 

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

 

@@ -180,7 +180,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1  $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/performance-tests/Latency/Single_Threaded/svc.conf b/TAO/performance-tests/Latency/Single_Threaded/svc.conf
index bf638f4e224..9e0c5ed01ed 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/svc.conf
+++ b/TAO/performance-tests/Latency/Single_Threaded/svc.conf
@@ -1,6 +1,6 @@
 #
 # $Id$
 #
-static Advanced_Resource_Factory "-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
+static Advanced_Resource_Factory "-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"
 static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
 static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"
diff --git a/TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml b/TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml
index 764859f1359..5b2a58bb6f0 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml
+++ b/TAO/performance-tests/Latency/Single_Threaded/svc.conf.xml
@@ -4,7 +4,7 @@
  <!--  -->
  <!--  $Id$ -->
  <!--  -->
- <static id="Advanced_Resource_Factory" params="-ORBresources global -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
+ <static id="Advanced_Resource_Factory" params="-ORBReactorMaskSignals 0 -ORBInputCDRAllocator null -ORBReactorType select_st -ORBConnectionCacheLock null"/>
  <static id="Server_Strategy_Factory" params="-ORBPOALock null -ORBAllowReactivationOfSystemids 0"/>
  <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBProfileLock null -ORBClientConnectionHandler RW"/>
 </ACE_Svc_Conf>