diff options
| author | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-07-11 21:43:51 +0000 |
|---|---|---|
| committer | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-07-11 21:43:51 +0000 |
| commit | 086e686b4bc36487f81339afdd2e64b947e2c1c4 (patch) | |
| tree | 9505c27f1bb222c904ffa1a2d1b0efa4f0096364 /TAO/orbsvcs/tests/AVStreams/Latency | |
| parent | ca270eec6356696454d93b7d08bc988b7fb27875 (diff) | |
| download | ATCD-086e686b4bc36487f81339afdd2e64b947e2c1c4.tar.gz | |
Wed Jul 11 16:03:58 2001 Paul Calabrese <calabrese_p@ociweb.com>
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Latency')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Latency/Makefile | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Latency/control.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Latency/control.dsp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Latency/ping.dsp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Latency/pong.dsp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Latency/svc.conf | 2 |
8 files changed, 11 insertions, 8 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile index abf458a6489..b85b17b106d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile @@ -6,7 +6,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_Strategies -lTAO_IORTable -lTAO_PortableServer -lTAO ifeq ($(rapi),1) LDLIBS += -lACE_QoS diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp index bb503c4efde..fcfa07ea215 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp @@ -3,6 +3,7 @@ #include "orbsvcs/AV/AVStreams_i.h" #include "orbsvcs/AV/FlowSpec_Entry.h" #include "tao/PortableServer/PortableServer.h" +#include "tao/Strategies/advanced_resource.h" #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/INET_Addr.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.dsp b/TAO/orbsvcs/tests/AVStreams/Latency/control.dsp index 0c8c956b37e..f032fc125fa 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/control.dsp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib TAO_AV.lib TAO_CosProperty.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
+# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib TAO_Strategies.lib TAO_AV.lib TAO_CosProperty.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "AVStreams Latency Control - Win32 Debug"
@@ -77,7 +77,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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_AVd.lib TAO_CosPropertyd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_Strategiesd.lib TAO_AVd.lib TAO_CosPropertyd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index 48bc32bf648..98d415865df 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp @@ -3,6 +3,7 @@ #include "ping.h" #include "orbsvcs/AV/Protocol_Factory.h" #include "tao/corba.h" +#include "tao/Strategies/advanced_resource.h" #include "ace/Get_Opt.h" #include "ace/High_Res_Timer.h" #include "ace/Stats.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.dsp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.dsp index c0e8ae44075..00feeb8c7bf 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.dsp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib TAO_AV.lib TAO_CosProperty.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
+# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib TAO_Strategies.lib TAO_AV.lib TAO_CosProperty.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "AVStreams Latency Ping - Win32 Debug"
@@ -77,7 +77,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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_AVd.lib TAO_CosPropertyd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_Strategiesd.lib TAO_AVd.lib TAO_CosPropertyd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index 87bf7b709ce..bd50c1f2842 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -3,6 +3,7 @@ #include "pong.h" #include "orbsvcs/AV/Protocol_Factory.h" #include "tao/PortableServer/PortableServer.h" +#include "tao/Strategies/advanced_resource.h" #include "tao/corba.h" #include "tao/debug.h" #include "ace/Get_Opt.h" diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.dsp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.dsp index c0e8ae44075..00feeb8c7bf 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.dsp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.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 /nologo /subsystem:console /machine:I386
-# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib TAO_AV.lib TAO_CosProperty.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
+# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib TAO_Strategies.lib TAO_AV.lib TAO_CosProperty.lib TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_IORTable.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "AVStreams Latency Ping - Win32 Debug"
@@ -77,7 +77,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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_AVd.lib TAO_CosPropertyd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_Strategiesd.lib TAO_AVd.lib TAO_CosPropertyd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_IORTabled.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao\IORTable"
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf b/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf index 147b102db85..d96d4bfa632 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf +++ b/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf @@ -1,5 +1,5 @@ # $Id$ # -static Resource_Factory "-ORBresources global -ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null" +static Advanced_Resource_Factory "-ORBresources global -ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null" static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0" static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST" |