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 | |
| parent | ca270eec6356696454d93b7d08bc988b7fb27875 (diff) | |
| download | ATCD-086e686b4bc36487f81339afdd2e64b947e2c1c4.tar.gz | |
Wed Jul 11 16:03:58 2001 Paul Calabrese <calabrese_p@ociweb.com>
94 files changed, 1341 insertions, 814 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 3e56be54827..c4c157e8a77 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,125 @@ +Wed Jul 11 16:03:58 2001 Paul Calabrese <calabrese_p@ociweb.com> + + * tao/Object_Loader.h: + * tao/Resource_Factory.cpp: + * tao/Resource_Factory.h: + * tao/Server_Strategy_Factory.cpp: + * tao/Server_Strategy_Factory.h: + * tao/default_client.cpp: + * tao/default_client.h: + * tao/default_resource.cpp: + * tao/default_resource.h: + * tao/default_server.cpp: + * tao/default_server.h: + * tao/Strategies/advanced_resource.cpp: + * tao/Strategies/advanced_resource.h: + + Improved processing of service configurator options. Many + failures were not being reported to the user. These changes + cause many failure to print warning messages but should not + affect execution of the code. The following situations now + result in warning messages: + - Passing unknown -ORB* options to a factory + (This includes passing advanced resource factory + options to the default resource factory) + - Passing an unknown value to a defined option + - Passing options to the default resource factory + (Resource_Factory) when the advanced resource factory + (Advanced_Resource_Factory) is being used + + I also removed several deprecated options: -ORBEventLoopLock, + -ORBDemuxStrategy, and -ORBConnectorLock. + + * examples/AMI/FL_Callback/AMI_Peer.dsp: + * examples/AMI/FL_Callback/AMI_Progress.dsp: + * examples/AMI/FL_Callback/Makefile: + * examples/AMI/FL_Callback/peer.conf: + * examples/AMI/FL_Callback/peer.cpp: + * examples/AMI/FL_Callback/svc.conf: + * orbsvcs/tests/AVStreams/Latency/Makefile: + * orbsvcs/tests/AVStreams/Latency/control.cpp: + * orbsvcs/tests/AVStreams/Latency/control.dsp: + * orbsvcs/tests/AVStreams/Latency/ping.cpp: + * orbsvcs/tests/AVStreams/Latency/ping.dsp: + * orbsvcs/tests/AVStreams/Latency/pong.cpp: + * orbsvcs/tests/AVStreams/Latency/pong.dsp: + * orbsvcs/tests/AVStreams/Latency/svc.conf: + * orbsvcs/tests/Event/Performance/latency.conf: + * orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf: + * performance-tests/Callback/Makefile: + * performance-tests/Callback/client.bor: + * performance-tests/Callback/client.cpp: + * performance-tests/Callback/client.dsp: + * performance-tests/Callback/server.bor: + * performance-tests/Callback/server.cpp: + * performance-tests/Callback/server.dsp: + * performance-tests/Callback/svc.conf: + * performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp: + * performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf: + * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: + * performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf: + * performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf: + * performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf: + * performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf: + * performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf: + * performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf: + * performance-tests/Cubit/TAO/MT_Cubit/Makefile: + * performance-tests/Cubit/TAO/MT_Cubit/client.bor: + * performance-tests/Cubit/TAO/MT_Cubit/client.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/client.dsp: + * performance-tests/Cubit/TAO/MT_Cubit/server.cpp: + * performance-tests/Cubit/TAO/MT_Cubit/server.dsp: + * performance-tests/Cubit/TAO/MT_Cubit/svc.conf: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp: + * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile: + * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf: + * performance-tests/Throughput/Makefile: + * performance-tests/Throughput/client.bor: + * performance-tests/Throughput/client.cpp: + * performance-tests/Throughput/server.bor: + * performance-tests/Throughput/server.cpp: + * performance-tests/Throughput/svc.conf: + * tests/AMI_Timeouts/svc.conf: + * tests/Collocation/Collocation.bor: + * tests/Collocation/Collocation.cpp: + * tests/Collocation/Collocation.dsp: + * tests/Collocation/Makefile.test: + * tests/Collocation/svc.conf: + * tests/Exposed_Policies/Client.dsp: + * tests/Exposed_Policies/Makefile: + * tests/Exposed_Policies/Server.dsp: + * tests/Exposed_Policies/client.bor: + * tests/Exposed_Policies/client.cpp: + * tests/Exposed_Policies/server.bor: + * tests/Exposed_Policies/server.conf: + * tests/Exposed_Policies/server.cpp: + * tests/Exposed_Policies/svc.conf: + * tests/FL_Cube/Makefile: + * tests/FL_Cube/client.bor: + * tests/FL_Cube/client.cpp: + * tests/FL_Cube/server.bor: + * tests/FL_Cube/server.cpp: + * tests/FL_Cube/svc.conf: + * tests/LongUpcalls/svc.conf: + * tests/MT_Server/server.conf: + * tests/Strategies/Makefile: + * tests/Strategies/README: + * tests/Strategies/client.bor: + * tests/Strategies/server.bor: + * tests/Strategies/svc.conf + + These are changes to TAO tests and examples with + broken service config files. The above changes + caused these files to generate warnings. The vast + majority of the problems were the passing of advanced + resource factory options to the default resource + factory. Most were changed to simply use the advanced + resource factory. Some were modified to use + the defaults of the default resource factory. + Wed Jul 11 14:41:20 2001 Jeff Parsons <parsons@cs.wustl.edu> * TAO_IDL/ast/ast_decl.cpp (compute_prefix): diff --git a/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp b/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp index 98dfc78fae6..6aa40292df2 100644 --- a/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp +++ b/TAO/examples/AMI/FL_Callback/AMI_Peer.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 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
!ELSEIF "$(CFG)" == "AMI Peer - 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 /out:"peer.exe" /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"peer.exe" /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
!ENDIF
diff --git a/TAO/examples/AMI/FL_Callback/AMI_Progress.dsp b/TAO/examples/AMI/FL_Callback/AMI_Progress.dsp index a8ab274d494..604f5a14d55 100644 --- a/TAO/examples/AMI/FL_Callback/AMI_Progress.dsp +++ b/TAO/examples/AMI/FL_Callback/AMI_Progress.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 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
!ELSEIF "$(CFG)" == "AMI Progress - 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 /out:"progress.exe" /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"progress.exe" /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
!ENDIF
diff --git a/TAO/examples/AMI/FL_Callback/Makefile b/TAO/examples/AMI/FL_Callback/Makefile index 9fb752cad58..42755ca9e23 100644 --- a/TAO/examples/AMI/FL_Callback/Makefile +++ b/TAO/examples/AMI/FL_Callback/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO IDL_FILES = test IDL_SRC = testC.cpp testS.cpp diff --git a/TAO/examples/AMI/FL_Callback/peer.conf b/TAO/examples/AMI/FL_Callback/peer.conf index 688fd7715c1..3f782fbc6f0 100644 --- a/TAO/examples/AMI/FL_Callback/peer.conf +++ b/TAO/examples/AMI/FL_Callback/peer.conf @@ -1,4 +1,3 @@ # $Id$ # -static Resource_Factory "-ORBReactorType tp" static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED" diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp index 8ce86f4e6ec..872da877e68 100644 --- a/TAO/examples/AMI/FL_Callback/peer.cpp +++ b/TAO/examples/AMI/FL_Callback/peer.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Sched_Params.h" +#include "tao/Strategies/advanced_resource.h" ACE_RCSID(FL_Callback, peer, "$Id$") diff --git a/TAO/examples/AMI/FL_Callback/svc.conf b/TAO/examples/AMI/FL_Callback/svc.conf index be6fb27be83..f7d75c036eb 100644 --- a/TAO/examples/AMI/FL_Callback/svc.conf +++ b/TAO/examples/AMI/FL_Callback/svc.conf @@ -1,3 +1,3 @@ # $Id$ # -static Resource_Factory "-ORBReactorType fl" +static Advanced_Resource_Factory "-ORBReactorType fl" 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" diff --git a/TAO/orbsvcs/tests/Event/Performance/latency.conf b/TAO/orbsvcs/tests/Event/Performance/latency.conf index efc4eae05b8..35359a852cb 100644 --- a/TAO/orbsvcs/tests/Event/Performance/latency.conf +++ b/TAO/orbsvcs/tests/Event/Performance/latency.conf @@ -1,3 +1,4 @@ # $Id$ -static Resource_Factory "-ORBReactorType tp" +# tp is now the default reactor type +# static Resource_Factory "-ORBReactorType tp" static Client_Strategy_Factory "-ORBClientConnectionHandler RW" diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf index ff01b67fc06..71ec9c42ce6 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf @@ -1 +1 @@ -static Resource_Factory "-ORBReactorType tp -ORBReactorMaskSignals 0"
\ No newline at end of file +static Resource_Factory "-ORBReactorMaskSignals 0" 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" diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf index 9206455908e..6e5455e2499 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf @@ -2,6 +2,6 @@ # # Please see $TAO_ROOT/docs/Options.html for details on these options. # -static Resource_Factory "-ORBReactorType select_st -ORBConnectionCacheLock null" +static Advanced_Resource_Factory "-ORBReactorType select_st -ORBConnectionCacheLock null" static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST" static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null" diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp index 88eccdfb857..360fd79c81f 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp @@ -3,6 +3,8 @@ #include "Cubit_Client.h" #include "Cubit_Server.h" +#include "tao/Strategies/advanced_resource.h" + #include "ace/Synch.h" #include "ace/Get_Opt.h" #include "ace/ARGV.h" diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf index e7622bae050..d1ffcb21d3f 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf @@ -1,2 +1,2 @@ dynamic IIOP_Lite_Factory Service_Object * TAO:_make_TAO_IIOP_Lite_Protocol_Factory() "" -static Resource_Factory "-ORBProtocolFactory IIOP_Lite_Factory" +static Advanced_Resource_Factory "-ORBProtocolFactory IIOP_Lite_Factory" diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl index 2020f15304a..0091d3c7100 100755 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl @@ -50,10 +50,10 @@ for ($i = 0; $i <= $#ARGV; $i++) { $clflags .= " -n $ARGV[$i + 1] "; $i++; } - elsif ($ARGV[$i] eq " -orblite ") { + elsif ($ARGV[$i] eq "-orblite") { $giopliteflag = 1; } - elsif ($ARGV[$i] eq " -verbose ") { + elsif ($ARGV[$i] eq "-verbose") { $quietflag = ""; } else { @@ -111,7 +111,7 @@ $CL->Arguments ($clflags . $clnsflags . $quietflag . " -x "); if ($giopliteflag) { print STDERR "\nRunning IDL_Cubit with the a lite ORB protocol.\n\n"; $SV->Arguments ($SV->Arguments () . " -ORBSvcConf $iiop_lite_conf "); - $CL->Arguments ($CL->Arugments () . " -ORBSvcConf $iiop_lite_conf "); + $CL->Arguments ($CL->Arguments () . " -ORBSvcConf $iiop_lite_conf "); } run_test_helper (); @@ -126,7 +126,7 @@ if ($OSNAME ne "MSWin32") { if ($giopliteflag) { print STDERR "\nRunning IDL_Cubit with the a UIOP lite ORB protocol.\n\n"; $SV->Arguments ($SV->Arguments () . " -ORBSvcConf $uiop_lite_conf "); - $CL->Arguments ($CL->Arugments () . " -ORBSvcConf $uiop_lite_conf "); + $CL->Arguments ($CL->Arguments () . " -ORBSvcConf $uiop_lite_conf "); } run_test_helper (); diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf index 845689fc35e..95bddd90d42 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf @@ -3,5 +3,5 @@ # Please see $TAO_ROOT/docs/Options.html for details on these options. # -static Resource_Factory "-ORBReactorType select_mt" +static Advanced_Resource_Factory "-ORBReactorType select_mt" static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0" diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf index abc9ba23e2e..56478215e3d 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf @@ -3,5 +3,5 @@ # Please see $TAO_ROOT/docs/Options.html for details on these options. # -static Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null" +static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null" static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW" diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf index 723cd557ac3..7482152738d 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf @@ -3,5 +3,5 @@ # Please see $TAO_ROOT/docs/Options.html for details on these options. # -static Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null" +static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null" static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0" diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf index 37b698c2cd7..24fb834d0db 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf @@ -7,6 +7,6 @@ # the only problems are on shutdown. # -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 Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW" static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0" diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf index 0a6f757b316..0fd993d9cbf 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf @@ -1,2 +1,2 @@ -dynamic UIOP_Lite_Factory Service_Object * TAO:_make_TAO_UIOP_Lite_Protocol_Factory() "" -static Resource_Factory "-ORBProtocolFactory UIOP_Lite_Factory" +dynamic UIOP_Lite_Factory Service_Object * TAO_Strategies:_make_TAO_UIOP_Lite_Protocol_Factory() "" +static Advanced_Resource_Factory "-ORBProtocolFactory UIOP_Lite_Factory" diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile index accc6631db7..41b16d7afbc 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_PortableServer -lTAO $(MATHLIB) +LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO $(MATHLIB) IDL_FILES = cubit IDL_SRC = cubitC.cpp cubitS.cpp diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.bor b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.bor index 20ebb2f225d..ed324ea9a70 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.bor +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.bor @@ -26,7 +26,8 @@ CFLAGS = \ LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) \ - $(TAO_PORTABLESERVER_LIB) + $(TAO_PORTABLESERVER_LIB) \ + $(TAO_STRATEGIES_LIB) IDLFILES = \ $(IDLDIR)\cubit.idl diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp index 6bbfedecf28..5700981f8af 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp @@ -7,6 +7,7 @@ #endif /* VXWORKS */ #include "ace/Sched_Params.h" +#include "tao/Strategies/advanced_resource.h" #include "server.h" #include "client.h" #include "Globals.h" diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp index eba244b8704..710f3c26881 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp @@ -53,7 +53,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 /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"
# SUBTRACT LINK32 /map /debug
!ELSEIF "$(CFG)" == "MT_Cubit Client - Win32 Debug"
@@ -79,7 +79,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 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"
!ELSEIF "$(CFG)" == "MT_Cubit Client - Win32 static Release"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp index 68f02a06aad..34ad515fc16 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp @@ -24,6 +24,7 @@ #include "server.h" #include "ace/Sched_Params.h" +#include "tao/Strategies/advanced_resource.h" #if defined (ACE_HAS_QUANTIFY) # include "quantify.h" diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp index bfb92017ab0..c083544821b 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp @@ -53,7 +53,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 /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"
# SUBTRACT LINK32 /map /debug
!ELSEIF "$(CFG)" == "MT_Cubit Server - Win32 Debug"
@@ -79,7 +79,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 /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"
!ELSEIF "$(CFG)" == "MT_Cubit Server - Win32 static Release"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf index 861671ff570..b7f7be24c58 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf @@ -3,6 +3,6 @@ # Please see $TAO_ROOT/docs/Options.html for details on these options. # -static Resource_Factory "-ORBResources tss -ORBInputCDRAllocator null -ORBConnectionCacheLock null" +static Advanced_Resource_Factory "-ORBResources tss -ORBInputCDRAllocator null -ORBConnectionCacheLock null" static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW" static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0" diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile index 4ac63da5260..7a77d6bacfd 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lRTCORBA_Common -lTAO_Strategies +LDLIBS = -lRTCORBA_Common BIN_UNCHECKED = server client @@ -47,6 +47,9 @@ include $(TAO_ROOT)/taoconfig.mk # Local targets #---------------------------------------------------------------------------- +RT_TAO_SRVR_LIBS := -lTAO_Strategies $(RT_TAO_SRVR_LIBS) +RT_TAO_CLNT_LIBS := -lTAO_Strategies $(RT_TAO_CLNT_LIBS) + server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_SRVR_LIBS) $(LDLIBS) $(POSTLINK) diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf index 44076ab9d15..8e7591235b8 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.conf @@ -1,6 +1,5 @@ # $Id$ # -static Resource_Factory "-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct" +static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct" static Client_Strategy_Factory "-ORBclientconnectionhandler RW" -static RT_ORB_Loader "" diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp index 85428a3cfb5..cced0e943f0 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp @@ -3,6 +3,7 @@ #include "testC.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" +#include "tao/Strategies/advanced_resource.h" #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Stats.h" diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf index 222ddd0e937..e51746649af 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.conf @@ -1,7 +1,7 @@ # $Id$ # -static Resource_Factory "-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct -ORBReactorType select_st -ORBInputCDRAllocator null" +static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null" static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0" -static RT_ORB_Loader "" +static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct" diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp index f0707033296..c1349e95874 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp @@ -4,6 +4,7 @@ #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTCORBA/Priority_Mapping.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" +#include "tao/Strategies/advanced_resource.h" #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Sched_Params.h" diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf index f84b0b45392..a3cfb88a2bf 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.conf @@ -1,5 +1,4 @@ # $Id$ # -static Resource_Factory "-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct" +static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBPriorityMapping direct" static Client_Strategy_Factory "-ORBClientConnectionHandler RW" -static RT_ORB_Loader "" diff --git a/TAO/performance-tests/Throughput/Makefile b/TAO/performance-tests/Throughput/Makefile index ecfa1ff06e5..1920c929d1a 100644 --- a/TAO/performance-tests/Throughput/Makefile +++ b/TAO/performance-tests/Throughput/Makefile @@ -42,6 +42,9 @@ include $(TAO_ROOT)/taoconfig.mk .PRECIOUS: $(foreach ext, $(IDL_EXT), Test$(ext)) +TAO_SRVR_LIBS := -lTAO_Strategies $(TAO_SRVR_LIBS) +TAO_CLNT_LIBS := -lTAO_Strategies $(TAO_CLNT_LIBS) + server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) diff --git a/TAO/performance-tests/Throughput/client.bor b/TAO/performance-tests/Throughput/client.bor index 8cbcb24dee6..7a63a3fbe4a 100644 --- a/TAO/performance-tests/Throughput/client.bor +++ b/TAO/performance-tests/Throughput/client.bor @@ -16,7 +16,8 @@ CFLAGS = \ LIBFILES = \ $(ACE_LIB) \ - $(TAO_LIB) + $(TAO_LIB) \ + $(TAO_STRATEGIES_LIB) IDLFILES = \ $(IDLDIR)\Test.idl diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp index 3aa2d17e251..02590168ec6 100644 --- a/TAO/performance-tests/Throughput/client.cpp +++ b/TAO/performance-tests/Throughput/client.cpp @@ -3,6 +3,7 @@ #include "TestC.h" #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" +#include "tao/Strategies/advanced_resource.h" ACE_RCSID(Throughput, client, "$Id$") diff --git a/TAO/performance-tests/Throughput/server.bor b/TAO/performance-tests/Throughput/server.bor index aa57a1c7b12..da0af08aea0 100644 --- a/TAO/performance-tests/Throughput/server.bor +++ b/TAO/performance-tests/Throughput/server.bor @@ -16,7 +16,8 @@ OBJFILES = \ CFLAGS = \ $(ACE_CFLAGS) \ $(TAO_CFLAGS) \ - $(TAO_PORTABLESERVER_CFLAGS) + $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_STRATEGIES_LIB) LIBFILES = \ $(ACE_LIB) \ diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp index 0788a406ab0..24df94eba30 100644 --- a/TAO/performance-tests/Throughput/server.cpp +++ b/TAO/performance-tests/Throughput/server.cpp @@ -2,6 +2,7 @@ #include "Receiver_Factory.h" #include "ace/Get_Opt.h" +#include "tao/Strategies/advanced_resource.h" ACE_RCSID(Throughput, server, "$Id$") diff --git a/TAO/performance-tests/Throughput/svc.conf b/TAO/performance-tests/Throughput/svc.conf index aa3f18e54f9..5ced7fa4227 100644 --- a/TAO/performance-tests/Throughput/svc.conf +++ b/TAO/performance-tests/Throughput/svc.conf @@ -3,6 +3,6 @@ # Please see $TAO_ROOT/docs/Options.html for details on these options. # -static Resource_Factory "-ORBresources global -ORBInputCDRAllocator null -ORBReactorType select_st -ORBReactorMaskSignals 0 -ORBConnectionCacheLock null" +static Advanced_Resource_Factory "-ORBresources global -ORBInputCDRAllocator null -ORBReactorType select_st -ORBReactorMaskSignals 0 -ORBConnectionCacheLock null" static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW" static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0" diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h index 951cd270cc3..d7603d3d7fc 100644 --- a/TAO/tao/Object_Loader.h +++ b/TAO/tao/Object_Loader.h @@ -27,7 +27,7 @@ * ORB. * * Many services and components of the ORB can be dynamically - * loaded, often this components are returned to the application via + * loaded, often these components are returned to the application via * an object reference (CORBA::Object_ptr). This class is used to * dynamically load such components, and encapsulate the creation of * the object reference. diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp index 43fca5817ff..b40168ef2dc 100644 --- a/TAO/tao/Resource_Factory.cpp +++ b/TAO/tao/Resource_Factory.cpp @@ -181,7 +181,7 @@ TAO_Resource_Factory::create_cached_connection_lock (void) } int -TAO_Resource_Factory:: load_default_protocols (void) +TAO_Resource_Factory::load_default_protocols (void) { return 0; } diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index dc52a868ecb..49fb5c4ae35 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -200,6 +200,12 @@ public: /// caller. virtual TAO_LF_Strategy *create_lf_strategy (void) = 0; + /// Disables the factory. When a new factory is installed and used, + /// this function should be called on the previously used (default) + /// factory. This should result in proper error reporting if the + /// user attempts to set options on an unused factory. + virtual void disable_factory (void) = 0; + protected: /** * Loads the default protocols. This method is used so that the @@ -207,6 +213,7 @@ protected: * without calling unnecessary functions. */ virtual int load_default_protocols (void); + }; #include "ace/post.h" diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp index 7975c675de5..4bfbf8cfcc0 100644 --- a/TAO/tao/Server_Strategy_Factory.cpp +++ b/TAO/tao/Server_Strategy_Factory.cpp @@ -49,12 +49,6 @@ TAO_Server_Strategy_Factory::server_connection_thread_count (void) return 0; } -ACE_Lock * -TAO_Server_Strategy_Factory::create_event_loop_lock (void) -{ - return 0; -} - const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters & TAO_Server_Strategy_Factory::active_object_map_creation_parameters (void) const { diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h index 0c0366957d0..066ea9db029 100644 --- a/TAO/tao/Server_Strategy_Factory.h +++ b/TAO/tao/Server_Strategy_Factory.h @@ -119,9 +119,6 @@ public: virtual int server_connection_thread_flags (void); virtual int server_connection_thread_count (void); - /// Creates and returns a lock for the event loop. - virtual ACE_Lock *create_event_loop_lock (void); - /// Return the active object map creation parameters. virtual const Active_Object_Map_Creation_Parameters &active_object_map_creation_parameters (void) const; diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 029c6c1932b..7b64336690a 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -71,143 +71,159 @@ TAO_Advanced_Resource_Factory::init (int argc, char **argv) { ACE_TRACE ("TAO_Advanced_Resource_Factory::init"); + // If this factory has already been disabled then + // print a warning and exit because any options + // are useless + if (this->factory_disabled_) { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) Warning: Resource_Factory options ignored\n") + ACE_TEXT ("Default Resource Factory is disabled\n"))); + return 0; + } + this->options_processed_ = 1; + + // If the default resource factory exists, then disable it. + // This causes any directives for the "Resource_Factory" to + // report warnings. + // Note: this is also being done in init_protocol_factories() + // to cover the case where init() is not called. + TAO_Resource_Factory *default_resource_factory = + ACE_Dynamic_Service<TAO_Resource_Factory>::instance ("Resource_Factory"); + if (default_resource_factory != 0) + { + default_resource_factory->disable_factory(); + } + int curarg = 0; + int unused_argc = 0; + char* unused_argv[argc+1]; for (curarg = 0; curarg < argc; curarg++) - if (ACE_OS::strcasecmp (argv[curarg], - "-ORBReactorRegistry") == 0) - { - - curarg++; - if (curarg < argc) - { - char *name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, - "single") == 0) - this->reactor_registry_type_ = TAO_SINGLE_REACTOR; - else if (ACE_OS::strcasecmp (name, - "per-priority") == 0) - this->reactor_registry_type_ = TAO_REACTOR_PER_PRIORITY; - else - ACE_DEBUG((LM_DEBUG, - ACE_TEXT ("TAO_Default_Factory - unknown argument") - ACE_TEXT (" <%s> for -ORBReactorRegistry\n"), name)); - } - } - - else if (ACE_OS::strcasecmp (argv[curarg], - "-ORBReactorLock") == 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_Default_Resource obsolete -ORBReactorLock ") - ACE_TEXT ("option, please use -ORBReactorType\n"))); - curarg++; - if (curarg < argc) - { - char *name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, "null") == 0) - this->reactor_type_ = TAO_REACTOR_SELECT_ST; - else if (ACE_OS::strcasecmp (name, "token") == 0) - this->reactor_type_= TAO_REACTOR_SELECT_MT; - } - } - - else if (ACE_OS::strcasecmp (argv[curarg], - "-ORBReactorType") == 0) - { - curarg++; - if (curarg < argc) - { - char *name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, - "select_mt") == 0) - this->reactor_type_ = TAO_REACTOR_SELECT_MT; - else if (ACE_OS::strcasecmp (name, - "select_st") == 0) - this->reactor_type_ = TAO_REACTOR_SELECT_ST; - else if (ACE_OS::strcasecmp (name, - "fl") == 0) + { + if (ACE_OS::strcasecmp (argv[curarg], + "-ORBReactorRegistry") == 0) + { + + curarg++; + if (curarg < argc) + { + char *name = argv[curarg]; + + if (ACE_OS::strcasecmp (name, + "single") == 0) + this->reactor_registry_type_ = TAO_SINGLE_REACTOR; + else if (ACE_OS::strcasecmp (name, + "per-priority") == 0) + this->reactor_registry_type_ = TAO_REACTOR_PER_PRIORITY; + else + this->report_option_value_error ("-ORBReactorRegistry", name); + } + } + + else if (ACE_OS::strcasecmp (argv[curarg], + "-ORBReactorLock") == 0) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO_Advanced_Resource_Factory - obsolete -ORBReactorLock ") + ACE_TEXT ("option, please use -ORBReactorType\n"))); + curarg++; + if (curarg < argc) + { + char *name = argv[curarg]; + + if (ACE_OS::strcasecmp (name, "null") == 0) + this->reactor_type_ = TAO_REACTOR_SELECT_ST; + else if (ACE_OS::strcasecmp (name, "token") == 0) + this->reactor_type_= TAO_REACTOR_SELECT_MT; + } + } + + else if (ACE_OS::strcasecmp (argv[curarg], + "-ORBReactorType") == 0) + { + curarg++; + if (curarg < argc) + { + char *name = argv[curarg]; + + if (ACE_OS::strcasecmp (name, + "select_mt") == 0) + this->reactor_type_ = TAO_REACTOR_SELECT_MT; + else if (ACE_OS::strcasecmp (name, + "select_st") == 0) + this->reactor_type_ = TAO_REACTOR_SELECT_ST; + else if (ACE_OS::strcasecmp (name, + "fl") == 0) #if defined(ACE_HAS_FL) - this->reactor_type_ = TAO_REACTOR_FL; + this->reactor_type_ = TAO_REACTOR_FL; #else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_Advanced_Factory - FlReactor") - ACE_TEXT (" not supported on this platform\n"))); + this->report_unsupported_error ("FlReactor"); #endif /* ACE_HAS_FL */ - else if (ACE_OS::strcasecmp (name, "tk_reactor") == 0) + else if (ACE_OS::strcasecmp (name, "tk_reactor") == 0) #if defined(ACE_HAS_TK) - this->reactor_type_ = TAO_REACTOR_TK; + this->reactor_type_ = TAO_REACTOR_TK; #else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_Advanced_Factory - TkReactor") - ACE_TEXT (" not supported on this platform\n"))); + this->report_unsupported_error ("TkReactor"); #endif /* ACE_HAS_TK */ - else if (ACE_OS::strcasecmp (name, + else if (ACE_OS::strcasecmp (name, "wfmo") == 0) #if defined(ACE_WIN32) - this->reactor_type_ = TAO_REACTOR_WFMO; + this->reactor_type_ = TAO_REACTOR_WFMO; #else - ACE_DEBUG ((LM_DEBUG, - "TAO_Advanced_Factory - WFMO Reactor" - " not supported on this platform\n")); + this->report_unsupported_error ("WFMO Reactor"); #endif /* ACE_WIN32 */ - else if (ACE_OS::strcasecmp (name, - "msg_wfmo") == 0) + else if (ACE_OS::strcasecmp (name, + "msg_wfmo") == 0) #if defined(ACE_WIN32) - this->reactor_type_ = TAO_REACTOR_MSGWFMO; + this->reactor_type_ = TAO_REACTOR_MSGWFMO; #else - ACE_DEBUG ((LM_DEBUG, - "TAO_Advanced_Factory - MsgWFMO Reactor" - " not supported on this platform\n")); + this->report_unsupported_error ("MsgWFMO Reactor"); #endif /* ACE_WIN32 */ - else if (ACE_OS::strcasecmp (name, - "tp") == 0) - this->reactor_type_ = TAO_REACTOR_TP; - else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_Advanced_Factory - unknown argument") - ACE_TEXT (" <%s> for -ORBreactortype\n"), name)); - } - } - - else if (ACE_OS::strcasecmp (argv[curarg], - "-ORBInputCDRAllocator") == 0) - { - curarg++; - if (curarg < argc) - { - char *name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, - "null") == 0) - { - this->cdr_allocator_type_ = TAO_ALLOCATOR_NULL_LOCK; - this->use_locked_data_blocks_ = 0; - } - else if (ACE_OS::strcasecmp (name, - "thread") == 0) - { - this->cdr_allocator_type_ = TAO_ALLOCATOR_THREAD_LOCK; - this->use_locked_data_blocks_ = 1; - } - } - } - else - { - if (TAO_debug_level > 0) - { - ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("TAO_Advanced_Factory: Unknown option ") - ACE_TEXT ("<%s>.\n"), - argv[curarg])); - } - } - - this->TAO_Default_Resource_Factory::init (argc, argv); + else if (ACE_OS::strcasecmp (name, + "tp") == 0) + this->reactor_type_ = TAO_REACTOR_TP; + else + this->report_option_value_error ("-ORBReactorType", name); + } + } + + else if (ACE_OS::strcasecmp (argv[curarg], + "-ORBInputCDRAllocator") == 0) + { + curarg++; + if (curarg < argc) + { + char *name = argv[curarg]; + + if (ACE_OS::strcasecmp (name, + "null") == 0) + { + this->cdr_allocator_type_ = TAO_ALLOCATOR_NULL_LOCK; + this->use_locked_data_blocks_ = 0; + } + else if (ACE_OS::strcasecmp (name, + "thread") == 0) + { + this->cdr_allocator_type_ = TAO_ALLOCATOR_THREAD_LOCK; + this->use_locked_data_blocks_ = 1; + } + else + { + this->report_option_value_error ("-ORBInputCDRAllocator", name); + } + } + } + else + { + unused_argv[unused_argc] = argv[curarg]; + unused_argc++; + } + } + + unused_argv[unused_argc] = 0; + + this->TAO_Default_Resource_Factory::init (unused_argc, unused_argv); return 0; } @@ -229,6 +245,18 @@ TAO_Advanced_Resource_Factory::load_default_protocols (void) int TAO_Advanced_Resource_Factory::init_protocol_factories (void) { + // If the default resource factory exists, then disable it. + // This causes any directives for the "Resource_Factory" to + // report warnings. + // This is needed to ensure warnings when no static directive + // for this factory is used (and init() is not called). + TAO_Resource_Factory *default_resource_factory = + ACE_Dynamic_Service<TAO_Resource_Factory>::instance ("Resource_Factory"); + if (default_resource_factory != 0) + { + default_resource_factory->disable_factory(); + } + TAO_ProtocolFactorySetItor end = protocol_factories_.end (); TAO_ProtocolFactorySetItor factory = protocol_factories_.begin (); @@ -691,6 +719,27 @@ TAO_Advanced_Resource_Factory::create_lf_strategy (void) return strategy; } +void +TAO_Advanced_Resource_Factory::report_option_value_error ( + const char* option_name, + const char* option_value) +{ + ACE_DEBUG((LM_DEBUG, + ACE_TEXT ("Advanced_Resource_Factory - unknown argument") + ACE_TEXT (" <%s> for <%s>\n"), + option_value, option_name)); +} + +void +TAO_Advanced_Resource_Factory::report_unsupported_error ( + const char* option_name) +{ + ACE_DEBUG((LM_DEBUG, + ACE_TEXT ("Advanced_Resource_Factory - <%s>") + ACE_TEXT (" not supported on this platform\n"), + option_name)); +} + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Advanced_Resource_Factory, diff --git a/TAO/tao/Strategies/advanced_resource.h b/TAO/tao/Strategies/advanced_resource.h index 0d06565778e..ae24f4aef6c 100644 --- a/TAO/tao/Strategies/advanced_resource.h +++ b/TAO/tao/Strategies/advanced_resource.h @@ -88,6 +88,11 @@ protected: virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const; // Obtain the reactor implementation + void report_option_value_error (const char* option_name, + const char* option_value); + + void report_unsupported_error (const char* option_name); + TAO_ProtocolFactorySet protocol_factories_; // list of loaded protocol factories. diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index 4f18da08b86..59549a457b9 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -64,6 +64,8 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv) else if (ACE_OS::strcasecmp (name, "null") == 0) this->profile_lock_type_ = TAO_NULL_LOCK; + else + this->report_option_value_error ("-ORBProfileLock", name); } } @@ -105,6 +107,8 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv) else if (ACE_OS::strcasecmp (name, "RW") == 0) this->wait_strategy_ = TAO_WAIT_ON_READ; + else + this->report_option_value_error ("-ORBClientConnectionHandler", name); } } else if (ACE_OS::strcmp (argv[curarg], @@ -121,9 +125,28 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv) else if (ACE_OS::strcasecmp (name, "EXCLUSIVE") == 0) this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS; + else + this->report_option_value_error ("-ORBTransportMuxStrategy", name); } } + else if (ACE_OS::strncmp (argv[curarg], "-ORB", 4) == 0) + { + // Can we assume there is an argument after the option? + // curarg++; + ACE_ERROR ((LM_ERROR, + "Client_Strategy_Factory - " + "unknown option <%s>\n", + argv[curarg])); + } + else + { + ACE_DEBUG ((LM_DEBUG, + "Client_Strategy_Factory - " + "ignoring option <%s>\n", + argv[curarg])); + } + } return 0; @@ -213,6 +236,17 @@ TAO_Default_Client_Strategy_Factory::create_ft_service_retention_id_lock (void) return the_lock; } +void +TAO_Default_Client_Strategy_Factory::report_option_value_error ( + const char* option_name, + const char* option_value) +{ + ACE_DEBUG((LM_DEBUG, + ACE_TEXT ("Client_Strategy_Factory - unknown argument") + ACE_TEXT (" <%s> for <%s>\n"), + option_value, option_name)); +} + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory, diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h index 266a5c6310e..f72ab06447b 100644 --- a/TAO/tao/default_client.h +++ b/TAO/tao/default_client.h @@ -56,6 +56,10 @@ public: virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport); virtual ACE_Lock *create_ft_service_retention_id_lock (void); +protected: + void report_option_value_error (const char* option_name, + const char* option_value); + private: enum Lock_Type { diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 521e6fc8218..e796014d92e 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -39,6 +39,8 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void) purge_percentage_ (TAO_PURGE_PERCENT), reactor_mask_signals_ (1), dynamically_allocated_reactor_ (0), + options_processed_ (0), + factory_disabled_ (0), cached_connection_lock_type_ (TAO_THREAD_LOCK), flushing_strategy_type_ (TAO_REACTIVE_FLUSHING) { @@ -69,6 +71,17 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) { ACE_TRACE ("TAO_Default_Resource_Factory::init"); + // If this factory has already been disabled then + // print a warning and exit because any options + // are useless + if (this->factory_disabled_) { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) Warning: Resource_Factory options ignored\n") + ACE_TEXT ("Default Resource Factory is disabled\n"))); + return 0; + } + this->options_processed_ = 1; + this->parser_names_count_ = 0; int curarg = 0; @@ -113,6 +126,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) else if (ACE_OS::strcasecmp (name, "tss") == 0) this->use_tss_resources_ = 1; + else + this->report_option_value_error ("-ORBResources", name); } } @@ -128,6 +143,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->reactor_mask_signals_ = 0; else if (ACE_OS::strcasecmp (name, "1") == 0) this->reactor_mask_signals_= 1; + else + this->report_option_value_error ("-ORBReactorMaskSignals", name); } } @@ -174,9 +191,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->connection_caching_type_ = TAO_Resource_Factory::NOOP; else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_Default_Factory - unknown argument") - ACE_TEXT (" <%s> for -ORBConnectionCachingStrategy\n"), name)); + this->report_option_value_error ("-ORBConnectionCachingStrategy", name); } } @@ -187,9 +202,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) if (curarg < argc) this->cache_maximum_ = ACE_OS::atoi (argv[curarg]); else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_Default_Factory - unknown argument") - ACE_TEXT ("for -ORBConnectionCacheMax\n"))); + this->report_option_value_error ("-ORBConnectionCacheMax", argv[curarg]); } else if (ACE_OS::strcasecmp (argv[curarg], @@ -199,9 +212,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) if (curarg < argc) this->purge_percentage_ = ACE_OS::atoi (argv[curarg]); else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_Default_Factory - unknown argument") - ACE_TEXT ("for -ORBConnectionCachePurgePercentage\n"))); + this->report_option_value_error ("-ORBConnectionCachePurgePercentage", + argv[curarg]); } else if (ACE_OS::strcasecmp (argv[curarg], @@ -216,9 +228,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) if (curarg < argc) this->purge_percentage_ = ACE_OS::atoi (argv[curarg]); else - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_Default_Factory - unknown argument") - ACE_TEXT ("for -ORBConnectionCachePurgePercentage\n"))); + this->report_option_value_error ("-ORBPurgePercentage", + argv[curarg]); } else if (ACE_OS::strcasecmp (argv[curarg], @@ -247,11 +258,13 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) "null") == 0) { // @@ Bug 940 :This is a sort of hack now. We need to put - // this in a common place once we get teh common + // this in a common place once we get the common // switch that is documented in bug 940... this->use_locked_data_blocks_ = 0; this->cached_connection_lock_type_ = TAO_NULL_LOCK; } + else + this->report_option_value_error ("-ORBConnectionCacheLock", name); } } @@ -279,6 +292,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->use_locked_data_blocks_ = 0; this->cached_connection_lock_type_ = TAO_NULL_LOCK; } + else + this->report_option_value_error ("-ORBConnectionLock", name); } } @@ -306,6 +321,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->use_locked_data_blocks_ = 0; this->cached_connection_lock_type_ = TAO_NULL_LOCK; } + else + this->report_option_value_error ("-ORBConnectorLock", name); } } @@ -323,8 +340,26 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) else if (ACE_OS::strcasecmp (name, "blocking") == 0) this->flushing_strategy_type_ = TAO_BLOCKING_FLUSHING; + else + this->report_option_value_error ("-ORBFlushingStrategy", name); } } + else if (ACE_OS::strncmp (argv[curarg], "-ORB", 4) == 0) + { + // Can we assume there is an argument after the option? + // curarg++; + ACE_ERROR ((LM_ERROR, + "Default_Resource_Factory - " + "unknown option <%s>\n", + argv[curarg])); + } + else + { + ACE_DEBUG ((LM_DEBUG, + "Default_Resource_Factory - " + "ignoring option <%s>\n", + argv[curarg])); + } return 0; } @@ -855,6 +890,29 @@ TAO_Default_Resource_Factory::create_lf_strategy (void) return strategy; } +void +TAO_Default_Resource_Factory::report_option_value_error ( + const char* option_name, + const char* option_value) +{ + ACE_DEBUG((LM_DEBUG, + ACE_TEXT ("Default_Resource_Factory - unknown argument") + ACE_TEXT (" <%s> for <%s>\n"), + option_value, option_name)); +} + +void +TAO_Default_Resource_Factory::disable_factory (void) +{ + this->factory_disabled_ = 1; + if (this->options_processed_) + { + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) Warning: Resource_Factory options ignored\n") + ACE_TEXT ("Default Resource Factory is disabled\n"))); + } +} + // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory, diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h index 736fff7b574..3f189678498 100644 --- a/TAO/tao/default_resource.h +++ b/TAO/tao/default_resource.h @@ -100,6 +100,8 @@ public: virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void); virtual TAO_LF_Strategy *create_lf_strategy (void); + virtual void disable_factory (void); + protected: /// Obtain the reactor implementation virtual ACE_Reactor_Impl *allocate_reactor_impl (void) const; @@ -107,6 +109,9 @@ protected: /// Add a Parser name to the list of Parser names. int add_to_ior_parser_names (const char *); + void report_option_value_error (const char* option_name, + const char* option_value); + protected: /// Flag indicating whether resources should be global or /// thread-specific. @@ -157,6 +162,16 @@ protected: virtual int load_default_protocols (void); + /// This flag is used to determine whether options have been + /// processed via the init() function. It is necessary to + /// properly report errors when the default factory is replaced. + int options_processed_; + + /// This flag specifies whether the factory has been disabled. + /// If it has been disabled we should print warnings if options + /// were processed before (or later). + int factory_disabled_; + private: enum Lock_Type { diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index 6e6d9467a6d..bfc0d102e59 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -13,7 +13,6 @@ TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void) : activate_server_connections_ (0), thread_flags_ (THR_BOUND | THR_DETACHED), poa_lock_type_ (TAO_THREAD_LOCK), - event_loop_lock_type_ (TAO_NULL_LOCK), thread_per_connection_use_timeout_ (-1) { } @@ -61,23 +60,6 @@ TAO_Default_Server_Strategy_Factory::server_connection_thread_count (void) return 1; } -ACE_Lock * -TAO_Default_Server_Strategy_Factory::create_event_loop_lock (void) -{ - ACE_Lock *the_lock = 0; - - if (this->event_loop_lock_type_ == TAO_NULL_LOCK) - ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX>, - 0); - else - ACE_NEW_RETURN (the_lock, - ACE_Lock_Adapter<TAO_SYNCH_RECURSIVE_MUTEX>, - 0); - - return the_lock; -} - // Evil macros b/c I'm lazy! #define TAO_BEGINCHECK if (0) #define TAO_CHECKANDSET(sym) \ @@ -144,6 +126,8 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[]) else if (ACE_OS::strcasecmp (name, "thread-per-connection") == 0) this->activate_server_connections_ = 1; + else + this->report_option_value_error ("-ORBConcurrency", name); } } @@ -245,6 +229,8 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[]) "linear") == 0) this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ = TAO_LINEAR; + else + this->report_option_value_error ("-ORBUseridPolicyDemuxStrategy", name); } } else if (ACE_OS::strcasecmp (argv[curarg], @@ -267,6 +253,8 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[]) "active") == 0) this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ = TAO_ACTIVE_DEMUX; + else + this->report_option_value_error ("-ORBSystemidPolicyDemuxStrategy", name); } } else if (ACE_OS::strcasecmp (argv[curarg], @@ -286,6 +274,8 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[]) "linear") == 0) this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ = TAO_LINEAR; + else + this->report_option_value_error ("-ORBPersistentidPolicyDemuxStrategy", name); } } else if (ACE_OS::strcasecmp (argv[curarg], @@ -308,6 +298,8 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[]) "active") == 0) this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ = TAO_ACTIVE_DEMUX; + else + this->report_option_value_error ("-ORBTransientidPolicyDemuxStrategy", name); } } else if (ACE_OS::strcasecmp (argv[curarg], @@ -326,17 +318,11 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[]) "linear") == 0) this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ = TAO_LINEAR; + else + this->report_option_value_error ("-ORBUniqueidPolicyReverseDemuxStrategy", name); } } else if (ACE_OS::strcasecmp (argv[curarg], - "-ORBDemuxStrategy") == 0) - { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Warning: -ORBDemuxStrategy is deprecated. Please use ") - ACE_TEXT ("-ORBSystemidPolicyDemuxStrategy or -ORBUseridPolicyDemuxStrategy instead.\n"))); - curarg++; - } - else if (ACE_OS::strcasecmp (argv[curarg], "-ORBPOALock") == 0) { curarg++; @@ -350,46 +336,50 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[]) else if (ACE_OS::strcasecmp (name, "null") == 0) this->poa_lock_type_ = TAO_NULL_LOCK; + else + this->report_option_value_error ("-ORBPOALock", name); } } else if (ACE_OS::strcasecmp (argv[curarg], - "-ORBEventLoopLock") == 0) + "-ORBThreadFlags") == 0) { curarg++; - if (curarg < argc) - { - char *name = argv[curarg]; - if (ACE_OS::strcasecmp (name, - "thread") == 0) - this->event_loop_lock_type_ = TAO_THREAD_LOCK; - else if (ACE_OS::strcasecmp (name, - "null") == 0) - this->event_loop_lock_type_ = TAO_NULL_LOCK; - } + if (curarg < argc) + this->tokenize (argv[curarg]); } - else if (ACE_OS::strcasecmp (argv[curarg], - "-ORBConnectorLock") == 0) + else if (ACE_OS::strncmp (argv[curarg], "-ORB", 4) == 0) { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) WARNING: the ") - ACE_TEXT ("-ORBConnectorLock option is in the client ") - ACE_TEXT ("strategy factory now\n"))); + // Can we assume there is an argument after the option? + // curarg++; + ACE_ERROR ((LM_ERROR, + "Server_Strategy_Factory - " + "unknown option <%s>\n", + argv[curarg])); } - - else if (ACE_OS::strcasecmp (argv[curarg], - "-ORBThreadFlags") == 0) + else { - curarg++; - - if (curarg < argc) - this->tokenize (argv[curarg]); + ACE_DEBUG ((LM_DEBUG, + "Server_Strategy_Factory - " + "ignoring option <%s>\n", + argv[curarg])); } return 0; } +void +TAO_Default_Server_Strategy_Factory::report_option_value_error ( + const char* option_name, + const char* option_value) +{ + ACE_DEBUG((LM_DEBUG, + ACE_TEXT ("Server_Strategy_Factory - unknown argument") + ACE_TEXT (" <%s> for <%s>\n"), + option_value, option_name)); +} + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h index 89487ff8976..49c3328b9a2 100644 --- a/TAO/tao/default_server.h +++ b/TAO/tao/default_server.h @@ -52,14 +52,6 @@ public: virtual int server_connection_thread_flags (void); virtual int server_connection_thread_count (void); - /** - * If the ORB is single threaded or some form of ORB-per-thread then - * it is more efficient to use a Null_Mutex for the variables - * controlling the event loop (termination). Otherwise a - * Recursive_Thread_Mutex or Thread_Mutex may be required. - */ - virtual ACE_Lock *create_event_loop_lock (void); - /// Parse the arguments, check the documentation in /// $TAO_ROOT/docs/Options.html for details int parse_args (int argc, char *argv[]); @@ -67,6 +59,9 @@ public: protected: void tokenize (char *flag_string); + void report_option_value_error (const char* option_name, + const char* option_value); + protected: /// Should the server connection handlers run in their own thread? int activate_server_connections_; @@ -83,9 +78,6 @@ protected: /// The type of lock to be returned by <create_poa_lock()>. Lock_Type poa_lock_type_; - /// The type of lock to be returned by <create_event_loop_lock()>. - Lock_Type event_loop_lock_type_; - /// The timeout flag and value for the thread-per-connection model int thread_per_connection_use_timeout_; ACE_Time_Value thread_per_connection_timeout_; diff --git a/TAO/tests/AMI_Timeouts/svc.conf b/TAO/tests/AMI_Timeouts/svc.conf index fa783cf178c..644bce82202 100644 --- a/TAO/tests/AMI_Timeouts/svc.conf +++ b/TAO/tests/AMI_Timeouts/svc.conf @@ -1,3 +1,2 @@ static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler MT" -static Resource_Factory "-ORBReactorType TP" diff --git a/TAO/tests/Collocation/Collocation.bor b/TAO/tests/Collocation/Collocation.bor index 34639d39ba8..80c6bde0aac 100644 --- a/TAO/tests/Collocation/Collocation.bor +++ b/TAO/tests/Collocation/Collocation.bor @@ -19,6 +19,7 @@ LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_STRATEGIES_LIB) \ $(BINDIR)\Diamond$(LIB_DECORATOR).lib \ $(BINDIR)\Coll_Test_Stubs$(LIB_DECORATOR).lib diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/Collocation.cpp index b61625d0c6f..4aca6d01fcd 100644 --- a/TAO/tests/Collocation/Collocation.cpp +++ b/TAO/tests/Collocation/Collocation.cpp @@ -3,6 +3,7 @@ #include "ace/streams.h" #include "ace/Get_Opt.h" #include "Coll_Tester.h" +#include "tao/Strategies/advanced_resource.h" ACE_RCSID(Collocation, main, "$Id$") diff --git a/TAO/tests/Collocation/Collocation.dsp b/TAO/tests/Collocation/Collocation.dsp index cb78ce9f185..2e118fc9f0b 100644 --- a/TAO/tests/Collocation/Collocation.dsp +++ b/TAO/tests/Collocation/Collocation.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 ace.lib TAO.lib TAO_PortableServer.lib Diamond.lib coll_test_stubs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib Diamond.lib coll_test_stubs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
!ELSEIF "$(CFG)" == "Collocation - 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 Diamondd.lib coll_test_stubsd.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 Diamondd.lib coll_test_stubsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
!ENDIF
diff --git a/TAO/tests/Collocation/Makefile.test b/TAO/tests/Collocation/Makefile.test index 0fb9db7f734..497aedb38f2 100644 --- a/TAO/tests/Collocation/Makefile.test +++ b/TAO/tests/Collocation/Makefile.test @@ -15,6 +15,7 @@ MAKEFILE = Makefile.test LDLIBS = -lCollocation_Test_Stub \ -lCollocation_Diamond \ + -lTAO_Strategies \ -lTAO_PortableServer \ -lTAO diff --git a/TAO/tests/Collocation/svc.conf b/TAO/tests/Collocation/svc.conf index 16f01bef61e..be81cfa2bd0 100644 --- a/TAO/tests/Collocation/svc.conf +++ b/TAO/tests/Collocation/svc.conf @@ -4,7 +4,7 @@ # # This is a single threaded "server." -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" # Make sure we use RW client handler so if something goes wrong, the program will bloc, # i.e., won't work. diff --git a/TAO/tests/Exposed_Policies/Client.dsp b/TAO/tests/Exposed_Policies/Client.dsp index 1efb5b2566d..74dc9cae9fc 100644 --- a/TAO/tests/Exposed_Policies/Client.dsp +++ b/TAO/tests/Exposed_Policies/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 ace.lib tao.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib TAO_Strategies.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\tao\RTPortableServer"
!ELSEIF "$(CFG)" == "Exposed_Policies 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Client.exe" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib taod.lib TAO_PortableServerd.lib TAO_Strategiesd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Client.exe" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\tao\RTPortableServer"
!ENDIF
diff --git a/TAO/tests/Exposed_Policies/Makefile b/TAO/tests/Exposed_Policies/Makefile index 7959f8a329a..a96e7c49dd6 100644 --- a/TAO/tests/Exposed_Policies/Makefile +++ b/TAO/tests/Exposed_Policies/Makefile @@ -54,6 +54,8 @@ include $(TAO_ROOT)/taoconfig.mk .PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext)) +RT_TAO_SRVR_LIBS := -lTAO_Strategies $(RT_TAO_SRVR_LIBS) + server: $(addprefix $(VDIR),$(SERVER_OBJ)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_SRVR_LIBS) $(POSTLINK) diff --git a/TAO/tests/Exposed_Policies/Server.dsp b/TAO/tests/Exposed_Policies/Server.dsp index 63134480b90..a0960469deb 100644 --- a/TAO/tests/Exposed_Policies/Server.dsp +++ b/TAO/tests/Exposed_Policies/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 ace.lib tao.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib TAO_Strategies.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\tao\RTPortableServer"
!ELSEIF "$(CFG)" == "Exposed_Policies 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 aced.lib taod.lib TAO_PortableServerd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Server.exe" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib taod.lib TAO_PortableServerd.lib TAO_Strategiesd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Server.exe" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\tao\RTPortableServer"
!ENDIF
diff --git a/TAO/tests/Exposed_Policies/client.bor b/TAO/tests/Exposed_Policies/client.bor index 2ea147b027c..8bc083cd945 100644 --- a/TAO/tests/Exposed_Policies/client.bor +++ b/TAO/tests/Exposed_Policies/client.bor @@ -24,6 +24,7 @@ LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_STRATEGIES_LIB) \ $(TAO_RTPORTABLESERVER_LIB) \ $(TAO_RTCORBA_LIB) diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp index 755ae730134..30e1205c761 100644 --- a/TAO/tests/Exposed_Policies/client.cpp +++ b/TAO/tests/Exposed_Policies/client.cpp @@ -7,6 +7,8 @@ // -- App. Specific Include -- #include "Policy_Verifier.h" +#include "tao/Strategies/advanced_resource.h" + ACE_RCSID(tao, client, "$Id$") int diff --git a/TAO/tests/Exposed_Policies/server.bor b/TAO/tests/Exposed_Policies/server.bor index 699c4f29704..d6c9f88b11c 100644 --- a/TAO/tests/Exposed_Policies/server.bor +++ b/TAO/tests/Exposed_Policies/server.bor @@ -26,6 +26,7 @@ LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) \ $(TAO_PORTABLESERVER_LIB) \ + $(TAO_STRATEGIES_LIB) \ $(TAO_RTPORTABLESERVER_LIB) \ $(TAO_RTCORBA_LIB) diff --git a/TAO/tests/Exposed_Policies/server.conf b/TAO/tests/Exposed_Policies/server.conf index fb46f394937..9f9ae96d624 100644 --- a/TAO/tests/Exposed_Policies/server.conf +++ b/TAO/tests/Exposed_Policies/server.conf @@ -1,2 +1,2 @@ static RT_ORB_Loader "" -static Resource_Factory "-ORBReactorType tp -ORBReactorRegistry per-priority" +static Advanced_Resource_Factory "-ORBReactorType tp -ORBReactorRegistry per-priority" diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp index e908f395433..ad05f1fb3d4 100644 --- a/TAO/tests/Exposed_Policies/server.cpp +++ b/TAO/tests/Exposed_Policies/server.cpp @@ -13,6 +13,8 @@ // -- App. Specific Include -- #include "Policy_Tester.h" +#include "tao/Strategies/advanced_resource.h" + ACE_RCSID(tao, server, "$Id$") diff --git a/TAO/tests/Exposed_Policies/svc.conf b/TAO/tests/Exposed_Policies/svc.conf index 95db9014835..28ac706710e 100644 --- a/TAO/tests/Exposed_Policies/svc.conf +++ b/TAO/tests/Exposed_Policies/svc.conf @@ -1,3 +1,3 @@ static RT_ORB_Loader "" -static Resource_Factory "-ORBReactorType tp -ORBReactorRegistry per-priority" +static Advanced_Resource_Factory "-ORBReactorType tp -ORBReactorRegistry per-priority" diff --git a/TAO/tests/FL_Cube/Makefile b/TAO/tests/FL_Cube/Makefile index 34681c6b974..74bb6603696 100644 --- a/TAO/tests/FL_Cube/Makefile +++ b/TAO/tests/FL_Cube/Makefile @@ -42,6 +42,9 @@ include $(TAO_ROOT)/taoconfig.mk .PRECIOUS: testS.h testS.i testS.cpp .PRECIOUS: testS_T.h testS_T.i testS_T.cpp +TAO_SRVR_LIBS := -lTAO_Strategies $(TAO_SRVR_LIBS) +TAO_CLNT_LIBS := -lTAO_Strategies $(TAO_CLNT_LIBS) + server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK) diff --git a/TAO/tests/FL_Cube/client.bor b/TAO/tests/FL_Cube/client.bor index 565b23dcc53..9e93a899f74 100644 --- a/TAO/tests/FL_Cube/client.bor +++ b/TAO/tests/FL_Cube/client.bor @@ -21,7 +21,8 @@ CFLAGS = \ LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) \ - $(TAO_PORTABLESERVER_LIB) + $(TAO_PORTABLESERVER_LIB) \ + $(TAO_STRATEGIES_LIB) IDLFILES = \ $(IDLDIR)\test.idl diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp index 6267d68055b..46acabb859b 100644 --- a/TAO/tests/FL_Cube/client.cpp +++ b/TAO/tests/FL_Cube/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "ace/Get_Opt.h" +#include "tao/Strategies/advanced_resource.h" ACE_RCSID(FL_Cube, client, "$Id$") diff --git a/TAO/tests/FL_Cube/server.bor b/TAO/tests/FL_Cube/server.bor index fffcda3dcb4..1692ee2231e 100644 --- a/TAO/tests/FL_Cube/server.bor +++ b/TAO/tests/FL_Cube/server.bor @@ -21,7 +21,8 @@ CFLAGS = \ LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) \ - $(TAO_PORTABLESERVER_LIB) + $(TAO_PORTABLESERVER_LIB) \ + $(TAO_STRATEGIES_LIB) IDLFILES = \ $(IDLDIR)\test.idl diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp index 5e33978d02f..561a50778db 100644 --- a/TAO/tests/FL_Cube/server.cpp +++ b/TAO/tests/FL_Cube/server.cpp @@ -2,6 +2,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" +#include "tao/Strategies/advanced_resource.h" ACE_RCSID(FL_Cube, server, "$Id$") diff --git a/TAO/tests/FL_Cube/svc.conf b/TAO/tests/FL_Cube/svc.conf index be6fb27be83..f7d75c036eb 100644 --- a/TAO/tests/FL_Cube/svc.conf +++ b/TAO/tests/FL_Cube/svc.conf @@ -1,3 +1,3 @@ # $Id$ # -static Resource_Factory "-ORBReactorType fl" +static Advanced_Resource_Factory "-ORBReactorType fl" diff --git a/TAO/tests/LongUpcalls/svc.conf b/TAO/tests/LongUpcalls/svc.conf index 0c93a12fc20..f04d979d03e 100644 --- a/TAO/tests/LongUpcalls/svc.conf +++ b/TAO/tests/LongUpcalls/svc.conf @@ -1,5 +1,5 @@ # # $Id$ # -static Resource_Factory "-ORBReactorType tp -ORBFlushingStrategy blocking" +static Resource_Factory "-ORBFlushingStrategy blocking" static Client_Strategy_Factory "-ORBClientConnectionHandler MT -ORBTransportMuxStrategy MUXED" diff --git a/TAO/tests/MT_Server/server.conf b/TAO/tests/MT_Server/server.conf index 0a9c9ed5cf6..0bd3f27be15 100644 --- a/TAO/tests/MT_Server/server.conf +++ b/TAO/tests/MT_Server/server.conf @@ -1,3 +1,2 @@ # $Id$ # -static Resource_Factory "-ORBReactorType tp" diff --git a/TAO/tests/Strategies/Makefile b/TAO/tests/Strategies/Makefile index 6b78a1aebd0..1c8a84d19a7 100644 --- a/TAO/tests/Strategies/Makefile +++ b/TAO/tests/Strategies/Makefile @@ -66,15 +66,22 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -86,199 +93,230 @@ realclean: clean $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/Task.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Containers_T.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Functor_T.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Process_Mutex.h \ + $(ACE_ROOT)/ace/Process_Mutex.inl \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ $(ACE_ROOT)/ace/Module.cpp \ $(ACE_ROOT)/ace/Stream_Modules.h \ $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Task_T.i \ simple_testC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Service_Context.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueFactory.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ - $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ - $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/TAOC.h \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ - $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/target_specification.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/BiDirPolicyC.h + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + simple_testC.i .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \ $(ACE_ROOT)/ace/Get_Opt.h \ @@ -291,15 +329,22 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -311,6 +356,7 @@ realclean: clean $(ACE_ROOT)/ace/Sock_Connect.h \ $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ simple_test_i.h simple_testS.h simple_testC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/corbafwd.h \ @@ -322,174 +368,159 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ - $(TAO_ROOT)/tao/Services.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Service_Context.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ - $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/TAOC.h \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ - $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/target_specification.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + simple_testC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - simple_testS_T.h simple_testS_T.cpp simple_testS_T.i + simple_testS_T.h simple_testS_T.i simple_testS_T.cpp simple_testS.i \ + simple_test_i.i .obj/simple_test_i.o .obj/simple_test_i.so .shobj/simple_test_i.o .shobj/simple_test_i.so: simple_test_i.cpp simple_test_i.h simple_testS.h \ simple_testC.h \ @@ -501,20 +532,27 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/post.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -532,174 +570,160 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ - $(TAO_ROOT)/tao/Services.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Service_Context.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ - $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ - $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RTCORBAC.h \ - $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Singleton.i \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/TAOC.h \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ - $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/target_specification.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/BoundsC.h \ - $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/BiDirPolicyC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + simple_testC.i \ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - simple_testS_T.h simple_testS_T.cpp simple_testS_T.i simple_test_i.i + simple_testS_T.h simple_testS_T.i simple_testS_T.cpp simple_testS.i \ + simple_test_i.i \ + $(TAO_ROOT)/tao/debug.h .obj/simple_testC.o .obj/simple_testC.so .shobj/simple_testC.o .shobj/simple_testC.so: simple_testC.cpp simple_testC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -710,20 +734,27 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/post.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -741,166 +772,251 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ - $(TAO_ROOT)/tao/Services.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Service_Context.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ + $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/TAO_Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ + $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + simple_testC.i \ $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/Policy_Set.h \ + $(TAO_ROOT)/tao/Policy_Set.i \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ $(TAO_ROOT)/tao/Resource_Factory.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(TAO_ROOT)/tao/Protocol_Factory.h \ $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ - $(TAO_ROOT)/tao/TAO_Singleton.h \ - $(TAO_ROOT)/tao/TAO_Singleton.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ - $(TAO_ROOT)/tao/PollableC.h \ $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ + $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ - $(TAO_ROOT)/tao/Endpoint.h \ - $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ - $(TAO_ROOT)/tao/Object_Ref_Table.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Singleton.i \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Invocation.h \ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Reply_Dispatcher.h \ + $(TAO_ROOT)/tao/Reply_Dispatcher.i \ $(TAO_ROOT)/tao/TAOC.h \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ - $(TAO_ROOT)/tao/Priority_Mapping.h \ + $(TAO_ROOT)/tao/TAOC.i \ $(TAO_ROOT)/tao/operation_details.h \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ $(TAO_ROOT)/tao/target_specification.h \ + $(TAO_ROOT)/tao/target_specification.i \ + $(TAO_ROOT)/tao/operation_details.i \ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/BiDirPolicyC.h \ $(TAO_ROOT)/tao/RequestInfo_Util.h \ - simple_testC.i + $(TAO_ROOT)/tao/ClientRequestInfo.h \ + $(TAO_ROOT)/tao/ClientRequestInfo.inl \ + $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \ + $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl .obj/simple_testS.o .obj/simple_testS.so .shobj/simple_testS.o .shobj/simple_testS.so: simple_testS.cpp simple_testS.h simple_testC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -911,20 +1027,27 @@ realclean: clean $(ACE_ROOT)/ace/ace_wchar.inl \ $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ + $(ACE_ROOT)/ace/OS_Errno.inl \ $(ACE_ROOT)/ace/post.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ + $(ACE_ROOT)/ace/OS_Dirent.inl \ $(ACE_ROOT)/ace/OS_String.h \ + $(ACE_ROOT)/ace/OS_String.inl \ $(ACE_ROOT)/ace/OS_Memory.h \ + $(ACE_ROOT)/ace/OS_Memory.inl \ $(ACE_ROOT)/ace/OS_TLI.h \ + $(ACE_ROOT)/ace/OS_TLI.inl \ $(ACE_ROOT)/ace/Min_Max.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -942,192 +1065,288 @@ realclean: clean $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \ + $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \ + $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/Synch.i \ $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Synch_T.i \ $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread_Adapter.h \ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ - $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread_Adapter.inl \ + $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc_Allocator.h \ $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc_Allocator.i \ $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers_T.h \ - $(ACE_ROOT)/ace/Containers_T.cpp \ - $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Unbounded_Set.h \ + $(ACE_ROOT)/ace/Node.h \ + $(ACE_ROOT)/ace/Node.cpp \ + $(ACE_ROOT)/ace/Unbounded_Set.inl \ + $(ACE_ROOT)/ace/Unbounded_Set.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/Message_Block_T.h \ - $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ $(TAO_ROOT)/tao/try_macros.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/Environment.h \ - $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/corbafwd.i \ + $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ $(ACE_ROOT)/ace/SString.h \ - $(TAO_ROOT)/tao/Services.h \ + $(ACE_ROOT)/ace/SString.i \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/Environment.h \ + $(TAO_ROOT)/tao/Environment.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.h \ + $(ACE_ROOT)/ace/Unbounded_Queue.inl \ + $(ACE_ROOT)/ace/Unbounded_Queue.cpp \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Managed_Types.h \ + $(TAO_ROOT)/tao/Managed_Types.i \ + $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/OctetSeqC.i \ + $(TAO_ROOT)/tao/Principal.i \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Services.h \ + $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ + $(TAO_ROOT)/tao/CORBA_String.inl \ $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ - $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ - $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/TAO_Server_Request.h \ - $(TAO_ROOT)/tao/Tagged_Profile.h \ - $(TAO_ROOT)/tao/IOPC.h \ - $(TAO_ROOT)/tao/GIOPC.h \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Service_Context.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Pluggable.h \ - $(TAO_ROOT)/tao/MProfile.h \ - $(TAO_ROOT)/tao/Profile.h \ - $(TAO_ROOT)/tao/Tagged_Components.h \ - $(TAO_ROOT)/tao/CONV_FRAMEC.h \ - $(TAO_ROOT)/tao/GIOP_Message_State.h \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/Policy_Manager.h \ - $(TAO_ROOT)/tao/Resource_Factory.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(TAO_ROOT)/tao/Protocol_Factory.h \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/BoundsC.h \ + $(TAO_ROOT)/tao/BoundsC.i \ + $(TAO_ROOT)/tao/ValueBase.h \ + $(TAO_ROOT)/tao/ValueBase.i \ + $(TAO_ROOT)/tao/ValueFactory.h \ + $(TAO_ROOT)/tao/ValueFactory.i \ + $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/DomainC.i \ + $(TAO_ROOT)/tao/WrongTransactionC.h \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/ObjectIDList.h \ + $(TAO_ROOT)/tao/ObjectIDList.i \ + $(TAO_ROOT)/tao/StringSeqC.h \ + $(TAO_ROOT)/tao/StringSeqC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.h \ + $(TAO_ROOT)/tao/DynamicC.h \ + $(TAO_ROOT)/tao/DynamicC.i \ + $(TAO_ROOT)/tao/MessagingC.h \ + $(TAO_ROOT)/tao/TimeBaseC.h \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \ + $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \ $(TAO_ROOT)/tao/TAO_Singleton.h \ + $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(TAO_ROOT)/tao/TAO_Singleton.inl \ - $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ - $(TAO_ROOT)/tao/PortableInterceptorC.h \ - $(TAO_ROOT)/tao/DynamicC.h \ - $(TAO_ROOT)/tao/MessagingC.h \ - $(TAO_ROOT)/tao/ValueBase.h \ - $(TAO_ROOT)/tao/ValueFactory.h \ - $(TAO_ROOT)/tao/TimeBaseC.h \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ + $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ + $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \ + $(TAO_ROOT)/tao/TimeBaseC.i \ + $(TAO_ROOT)/tao/IOPC.h \ + $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ + $(TAO_ROOT)/tao/PollableC.i \ + $(TAO_ROOT)/tao/MessagingC.i \ + $(TAO_ROOT)/tao/PortableInterceptorC.i \ + simple_testC.i \ + $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ + $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ + $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ + $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ + $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + simple_testS_T.h simple_testS_T.i simple_testS_T.cpp simple_testS.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ + $(ACE_ROOT)/ace/Map_T.h \ + $(ACE_ROOT)/ace/Pair.h \ + $(ACE_ROOT)/ace/Pair_T.h \ + $(ACE_ROOT)/ace/Pair_T.i \ + $(ACE_ROOT)/ace/Pair_T.cpp \ $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(TAO_ROOT)/tao/Parser_Registry.h \ - $(TAO_ROOT)/tao/Service_Callbacks.h \ - $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ - $(TAO_ROOT)/tao/Transport_Cache_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ + $(ACE_ROOT)/ace/Functor.i \ $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.cpp \ $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(TAO_ROOT)/tao/Cache_Entries.h \ - $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \ - $(TAO_ROOT)/tao/Endpoint.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Active_Map_Manager.h \ + $(ACE_ROOT)/ace/Active_Map_Manager.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ + $(ACE_ROOT)/ace/Map_T.i \ + $(ACE_ROOT)/ace/Map_T.cpp \ + $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \ + $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \ + $(TAO_ROOT)/tao/Adapter.h \ + $(TAO_ROOT)/tao/Adapter.i \ + $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \ + $(TAO_ROOT)/tao/PortableServer/Policy_Validator.h \ + $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \ + $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \ + $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \ + $(TAO_ROOT)/tao/Policy_Set.h \ + $(TAO_ROOT)/tao/Policy_Set.i \ + $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \ + $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \ + $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ + $(TAO_ROOT)/tao/TAO_Server_Request.h \ + $(TAO_ROOT)/tao/Tagged_Profile.h \ + $(TAO_ROOT)/tao/GIOPC.h \ + $(TAO_ROOT)/tao/GIOPC.i \ + $(TAO_ROOT)/tao/Tagged_Profile.i \ + $(TAO_ROOT)/tao/Service_Context.h \ + $(TAO_ROOT)/tao/Service_Context.inl \ + $(TAO_ROOT)/tao/TAO_Server_Request.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/Policy_Manager.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Policy_Manager.i \ + $(TAO_ROOT)/tao/Resource_Factory.h \ + $(TAO_ROOT)/tao/Pluggable.h \ + $(TAO_ROOT)/tao/Pluggable.i \ + $(TAO_ROOT)/tao/Protocol_Factory.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/PolicyFactory_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.h \ + $(TAO_ROOT)/tao/Parser_Registry.i \ + $(TAO_ROOT)/tao/Service_Callbacks.h \ + $(TAO_ROOT)/tao/Service_Callbacks.i \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \ + $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \ + $(ACE_ROOT)/ace/Array_Base.h \ + $(ACE_ROOT)/ace/Array_Base.inl \ + $(ACE_ROOT)/ace/Array_Base.cpp \ + $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \ $(TAO_ROOT)/tao/Object_Ref_Table.h \ $(TAO_ROOT)/tao/Interceptor_List.h \ - $(TAO_ROOT)/tao/RT_Policy_i.h \ - $(TAO_ROOT)/tao/RTCORBAC.h \ + $(TAO_ROOT)/tao/Interceptor_List.inl \ $(TAO_ROOT)/tao/Protocols_Hooks.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Singleton.i \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Invocation.h \ - $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/Reply_Dispatcher.h \ - $(TAO_ROOT)/tao/TAOC.h \ - $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \ - $(TAO_ROOT)/tao/Priority_Mapping.h \ - $(TAO_ROOT)/tao/operation_details.h \ - $(TAO_ROOT)/tao/target_specification.h \ - $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \ - $(TAO_ROOT)/tao/ObjectIDList.h \ - $(TAO_ROOT)/tao/DomainC.h \ - $(TAO_ROOT)/tao/ClientRequestInfo.h \ - $(TAO_ROOT)/tao/StringSeqC.h \ - $(TAO_ROOT)/tao/WrongTransactionC.h \ - $(TAO_ROOT)/tao/BoundsC.h \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/MProfile.h \ + $(TAO_ROOT)/tao/Profile.h \ + $(TAO_ROOT)/tao/Tagged_Components.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.h \ + $(TAO_ROOT)/tao/CONV_FRAMEC.i \ + $(TAO_ROOT)/tao/Tagged_Components.i \ + $(TAO_ROOT)/tao/GIOP_Message_Version.h \ + $(TAO_ROOT)/tao/GIOP_Message_Version.inl \ + $(TAO_ROOT)/tao/Profile.i \ + $(TAO_ROOT)/tao/MProfile.i \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ $(TAO_ROOT)/tao/PortableInterceptor.h \ - $(TAO_ROOT)/tao/BiDirPolicyC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServer.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ - $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \ - $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \ - $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \ - $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - simple_testS_T.h simple_testS_T.cpp simple_testS_T.i \ - $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \ - $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(TAO_ROOT)/tao/PortableServer/poa_macros.h \ - $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \ - $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \ $(TAO_ROOT)/tao/RequestInfo_Util.h \ - simple_testS.i + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ + $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \ + $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tests/Strategies/README b/TAO/tests/Strategies/README index be8a14fedd6..d6116565696 100644 --- a/TAO/tests/Strategies/README +++ b/TAO/tests/Strategies/README @@ -8,7 +8,7 @@ the advanced TAO strategies are defined in tao/Strategies/advanced_resource.cpp. The advanced TAO strategies can be loaded dynamically or -staticallu linked. To load these startegies dynamically, we need to +statically linked. To load these strategies dynamically, we need to use the service configurator files. But, if we need to link them statically, we need to link the library and include the header file. diff --git a/TAO/tests/Strategies/client.bor b/TAO/tests/Strategies/client.bor index c36181335bb..4a4925b40e6 100644 --- a/TAO/tests/Strategies/client.bor +++ b/TAO/tests/Strategies/client.bor @@ -18,7 +18,8 @@ CFLAGS = \ LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) \ - $(TAO_PORTABLESERVER_LIB) + $(TAO_PORTABLESERVER_LIB) \ + $(TAO_STRATEGIES_LIB) IDLFILES = \ $(IDLDIR)\simple_test.idl diff --git a/TAO/tests/Strategies/server.bor b/TAO/tests/Strategies/server.bor index 8422203618d..19dd22703e0 100644 --- a/TAO/tests/Strategies/server.bor +++ b/TAO/tests/Strategies/server.bor @@ -20,7 +20,8 @@ CFLAGS = \ LIBFILES = \ $(ACE_LIB) \ $(TAO_LIB) \ - $(TAO_PORTABLESERVER_LIB) + $(TAO_PORTABLESERVER_LIB) \ + $(TAO_STRATEGIES_LIB) IDLFILES = \ $(IDLDIR)\simple_test.idl diff --git a/TAO/tests/Strategies/svc.conf b/TAO/tests/Strategies/svc.conf index 88dfeb9d98d..7bdc6833362 100644 --- a/TAO/tests/Strategies/svc.conf +++ b/TAO/tests/Strategies/svc.conf @@ -4,6 +4,6 @@ # This configuration file is used to use only the default TAO # strategies -static Resource_Factory "-ORBResources global -ORBReactorType select_mt -ORBProtocolFactory IIOP_Factory" +static Resource_Factory "-ORBResources global -ORBProtocolFactory IIOP_Factory" |