diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-14 18:09:50 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-14 18:09:50 +0000 |
| commit | 80d9683a202fe39dffe9f835249db15b6f3018af (patch) | |
| tree | 447bdda7098ad3328a3a98e58e2849ee515ceb90 | |
| parent | 1ac4d0d328a65b28485dd2cc1ce15f01a2411d2a (diff) | |
| download | ATCD-80d9683a202fe39dffe9f835249db15b6f3018af.tar.gz | |
ChangeLogTag:Wed Feb 14 10:02:44 2001 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 25 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/Domain/Makefile | 5 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/Makefile | 28 | ||||
| -rw-r--r-- | TAO/tao/DynamicInterface/Makefile | 29 | ||||
| -rw-r--r-- | TAO/tao/IFR_Client/Makefile | 56 | ||||
| -rw-r--r-- | TAO/tao/IORManipulation/Makefile | 10 | ||||
| -rw-r--r-- | TAO/tao/IORTable/Makefile | 4 | ||||
| -rw-r--r-- | TAO/tao/Makefile | 1851 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Makefile | 30 | ||||
| -rw-r--r-- | TAO/tao/Queued_Message.cpp | 34 | ||||
| -rw-r--r-- | TAO/tao/Queued_Message.h | 10 | ||||
| -rw-r--r-- | TAO/tao/Strategies/Makefile | 348 | ||||
| -rw-r--r-- | TAO/tao/Transport.cpp | 18 | ||||
| -rw-r--r-- | TAO/tests/Makefile | 3 | ||||
| -rw-r--r-- | TAO/tests/Queued_Message_Test/Makefile | 154 | ||||
| -rw-r--r-- | TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp | 137 |
17 files changed, 1662 insertions, 1086 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 6bc38dc0da6..274ffdbcf5f 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,28 @@ +Wed Feb 14 10:02:44 2001 Carlos O'Ryan <coryan@uci.edu> + + * tao/Queued_Message.h: + * tao/Queued_Message.cpp: + Add flag to control message block ownership, used to minimize + memory allocations. + + * tao/Transport.cpp: + Use the ownership flags for the Queued_Message. + + * tests/Makefile: + * tests/Queued_Message_Test/Makefile: + * tests/Queued_Message_Test/Queued_Message_Test.cpp: + Add new unit test for the TAO_Queued_Message class. + + * tao/Makefile: + * tao/Domain/Makefile: + * tao/DynamicAny/Makefile: + * tao/DynamicInterface/Makefile: + * tao/IFR_Client/Makefile: + Update dependencies + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: + The ACE_SSL_SOCK_Stream does not support sendv() + Mon Feb 12 15:44:54 2001 Carlos O'Ryan <coryan@uci.edu> * tao/Makefile: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp index ce86988506b..bbf60203a7f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp @@ -77,10 +77,10 @@ TAO_SSLIOP_Transport::idle (void) ssize_t TAO_SSLIOP_Transport::send (iovec *iov, int iovcnt, size_t &bytes_transferred, - const ACE_Time_Value *timeout = 0) + const ACE_Time_Value *max_wait_time) { - ssize_t retval = this->service_handler ()->peer ().sendv (iov, iovcnt, - max_wait_time); + ssize_t retval = this->service_handler ()->peer ().send (iov, iovcnt, + max_wait_time); if (retval > 0) bytes_transferred = retval; diff --git a/TAO/tao/Domain/Makefile b/TAO/tao/Domain/Makefile index d53ccaacb5e..499a4e227ef 100644 --- a/TAO/tao/Domain/Makefile +++ b/TAO/tao/Domain/Makefile @@ -50,8 +50,7 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainS.h \ - $(ACE_ROOT)/ace/pre.h \ - domain_export.h \ + $(ACE_ROOT)/ace/pre.h domain_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -382,8 +381,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IFR_Client/InterfaceC.h \ $(TAO_ROOT)/tao/IFR_Client/ifrfwd.h \ $(TAO_ROOT)/tao/IFR_Client/ifr_client_export.h \ - $(TAO_ROOT)/tao/IFR_Client/IFR_Client_Adapter_Impl.h \ - $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ $(TAO_ROOT)/tao/IFR_Client/InterfaceC.i \ $(TAO_ROOT)/tao/TAO_Server_Request.h \ $(TAO_ROOT)/tao/Tagged_Profile.h \ diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile index e6752f8df4e..7d247d0dad9 100644 --- a/TAO/tao/DynamicAny/Makefile +++ b/TAO/tao/DynamicAny/Makefile @@ -383,8 +383,8 @@ CPPFLAGS += -I$(TAO_ROOT) DynamicAnyC.i DynAnyFactory.h .obj/DynAnyFactory.o .obj/DynAnyFactory.so .shobj/DynAnyFactory.o .shobj/DynAnyFactory.so: DynAnyFactory.cpp DynAnyFactory.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -708,8 +708,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Auto_Ptr.cpp .obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp DynAny_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1029,8 +1029,8 @@ CPPFLAGS += -I$(TAO_ROOT) DynamicAnyC.i DynAnyFactory.h .obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp DynStruct_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1376,8 +1376,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/OS.i DynamicAny.h \ + dynamicany_export.h \ $(TAO_ROOT)/tao/Object_Loader.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1675,8 +1675,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Marshal.i .obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp DynEnum_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1996,8 +1996,8 @@ CPPFLAGS += -I$(TAO_ROOT) DynamicAnyC.i DynAnyFactory.h .obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp DynArray_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2319,8 +2319,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Marshal.i .obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp DynUnion_i.h \ - $(ACE_ROOT)/ace/pre.h \ - DynamicAny.h dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h DynamicAny.h \ + dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile index fa39d25032c..34115662927 100644 --- a/TAO/tao/DynamicInterface/Makefile +++ b/TAO/tao/DynamicInterface/Makefile @@ -484,13 +484,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/Asynch_Invocation.i \ - DII_Reply_Dispatcher.h dynamicinterface_export.h Request.h \ - Dynamic_Adapter_Impl.h \ + Unknown_User_Exception.h dynamicinterface_export.h \ + DII_Reply_Dispatcher.h Request.h Dynamic_Adapter_Impl.h \ $(TAO_ROOT)/tao/Dynamic_Adapter.h \ Context.h Context.inl ExceptionList.h ExceptionList.inl \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ - Request.inl DII_Invocation.inl Unknown_User_Exception.h \ + Request.inl DII_Invocation.inl \ $(TAO_ROOT)/tao/Principal.h \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ @@ -498,27 +498,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \ $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/Transport.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ $(TAO_ROOT)/tao/Transport.inl .obj/DII_Reply_Dispatcher.o .obj/DII_Reply_Dispatcher.so .shobj/DII_Reply_Dispatcher.o .shobj/DII_Reply_Dispatcher.so: DII_Reply_Dispatcher.cpp \ @@ -1796,7 +1775,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \ $(TAO_ROOT)/tao/Asynch_Invocation.i \ - DII_Reply_Dispatcher.h DII_Invocation.inl \ + Unknown_User_Exception.h DII_Reply_Dispatcher.h DII_Invocation.inl \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i diff --git a/TAO/tao/IFR_Client/Makefile b/TAO/tao/IFR_Client/Makefile index 109eb155a5c..4e56d9e3710 100644 --- a/TAO/tao/IFR_Client/Makefile +++ b/TAO/tao/IFR_Client/Makefile @@ -50,8 +50,8 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/InterfaceC.o .obj/InterfaceC.so .shobj/InterfaceC.o .shobj/InterfaceC.so: InterfaceC.cpp InterfaceC.h \ - $(ACE_ROOT)/ace/pre.h \ - ifrfwd.h ifr_client_export.h \ + $(ACE_ROOT)/ace/pre.h ifrfwd.h \ + ifr_client_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -147,29 +147,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - IFR_Client_Adapter_Impl.h \ - $(TAO_ROOT)/tao/IFR_Client_Adapter.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.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.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 \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -194,6 +171,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.i \ @@ -238,6 +217,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/LocalObject.i \ $(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/params.i \ @@ -261,6 +244,21 @@ CPPFLAGS += -I$(TAO_ROOT) $(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.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 \ $(TAO_ROOT)/tao/Parser_Registry.h \ $(TAO_ROOT)/tao/Parser_Registry.i \ $(TAO_ROOT)/tao/Service_Callbacks.h \ @@ -342,7 +340,9 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IFR_Client_Adapter_Impl.o .obj/IFR_Client_Adapter_Impl.so .shobj/IFR_Client_Adapter_Impl.o .shobj/IFR_Client_Adapter_Impl.so: IFR_Client_Adapter_Impl.cpp \ IFR_Client_Adapter_Impl.h \ $(ACE_ROOT)/ace/pre.h \ - ifr_client_export.h \ + $(TAO_ROOT)/tao/IFR_Client_Adapter.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -351,8 +351,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ - $(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 \ @@ -438,11 +436,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ $(TAO_ROOT)/tao/corbafwd.i \ - $(TAO_ROOT)/tao/IFR_Client_Adapter.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 \ + ifr_client_export.h \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile index de45095d1f5..de6a11dfc08 100644 --- a/TAO/tao/IORManipulation/Makefile +++ b/TAO/tao/IORManipulation/Makefile @@ -196,8 +196,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - IORC.i \ + $(TAO_ROOT)/tao/CDR.i IORC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ @@ -355,8 +354,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - IORC.i IORManipulation.h \ + $(TAO_ROOT)/tao/CDR.i IORC.i \ + IORManipulation.h \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i @@ -503,8 +502,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i \ - IORC.i \ + $(TAO_ROOT)/tao/CDR.i IORC.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ diff --git a/TAO/tao/IORTable/Makefile b/TAO/tao/IORTable/Makefile index 4262bd245b7..e42345125fc 100644 --- a/TAO/tao/IORTable/Makefile +++ b/TAO/tao/IORTable/Makefile @@ -1009,8 +1009,8 @@ CPPFLAGS += -I$(TAO_ROOT) IORTableC.i .obj/IOR_Table_Impl.o .obj/IOR_Table_Impl.so .shobj/IOR_Table_Impl.o .shobj/IOR_Table_Impl.so: IOR_Table_Impl.cpp IOR_Table_Impl.h \ - $(ACE_ROOT)/ace/pre.h \ - IORTable.h iortable_export.h \ + $(ACE_ROOT)/ace/pre.h IORTable.h \ + iortable_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index f716337e2c6..0fc74a6df24 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -757,8 +757,7 @@ realclean: target_specification.i .obj/Transport.o .obj/Transport.so .shobj/Transport.o .shobj/Transport.so: Transport.cpp Transport.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -858,65 +857,6 @@ realclean: $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/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.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/Thread_Manager.h \ - $(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/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.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(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/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 \ Transport.inl ORB_Core.h ORB.h \ Exception.h \ Services.h \ @@ -954,25 +894,32 @@ realclean: LocalObject.i \ Policy_Manager.i \ 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 \ Pluggable.h \ IOPC.h \ IOPC.i \ Pluggable.i \ Protocol_Factory.h \ - params.h \ - params.i \ + params.h params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ TAO_Singleton.inl \ TAO_Singleton.cpp \ TAO_Singleton.h \ + $(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_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h \ - Any.h \ - Any.i \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + DynamicC.h Any.h \ + Any.i DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -985,6 +932,21 @@ realclean: $(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.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 \ Parser_Registry.h \ Parser_Registry.i \ Service_Callbacks.h \ @@ -992,6 +954,14 @@ realclean: Fault_Tolerance_Service.h \ Fault_Tolerance_Service.i \ Connection_Cache_Manager.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.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ Cache_Entries.h \ Connection_Descriptor_Interface.h \ Endpoint.h \ @@ -1019,12 +989,41 @@ realclean: RTCORBAS_T.cpp \ RTCORBAS.i \ RT_Policy_i.i \ - Protocols_Hooks.h RTCORBAC.h ORB_Core.i Client_Strategy_Factory.h \ - TAO_Export.h Wait_Strategy.h Transport_Mux_Strategy.h + Protocols_Hooks.h RTCORBAC.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + ORB_Core.i Client_Strategy_Factory.h TAO_Export.h Wait_Strategy.h \ + Transport_Mux_Strategy.h Stub.h \ + MProfile.h \ + Profile.h \ + Tagged_Components.h \ + CONV_FRAMEC.h \ + CONV_FRAMEC.i \ + Tagged_Components.i \ + GIOP_Message_State.h \ + GIOP_Message_State.i \ + Profile.i \ + MProfile.i \ + ORB.h \ + ORB_Core.h \ + Stub.i \ + Sync_Strategies.h \ + Transport.h \ + TAOC.h \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + Priority_Mapping.i \ + Priority_Mapping_Manager.i \ + TAOC.i \ + Sync_Strategies.i \ + Queued_Message.h Queued_Message.inl Flushing_Strategy.h .obj/Profile.o .obj/Profile.so .shobj/Profile.o .shobj/Profile.so: Profile.cpp Profile.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1286,8 +1285,7 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i \ - debug.h + Stub.i debug.h .obj/Endpoint.o .obj/Endpoint.so .shobj/Endpoint.o .shobj/Endpoint.so: Endpoint.cpp \ Endpoint.h \ @@ -2396,6 +2394,550 @@ realclean: corbafwd.i \ Acceptor_Filter.i +.obj/Flushing_Strategy.o .obj/Flushing_Strategy.so .shobj/Flushing_Strategy.o .shobj/Flushing_Strategy.so: Flushing_Strategy.cpp Flushing_Strategy.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(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/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 \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(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/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.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(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.i \ + $(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.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(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/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + TAO_Export.h \ + corbafwd.i + +.obj/Block_Flushing_Strategy.o .obj/Block_Flushing_Strategy.so .shobj/Block_Flushing_Strategy.o .shobj/Block_Flushing_Strategy.so: Block_Flushing_Strategy.cpp \ + Block_Flushing_Strategy.h \ + $(ACE_ROOT)/ace/pre.h \ + Flushing_Strategy.h corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(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/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 \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(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/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.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(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.i \ + $(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.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(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/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + TAO_Export.h \ + corbafwd.i \ + Transport.h Exception.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Transport.inl Queued_Message.h Queued_Message.inl + +.obj/Reactive_Flushing_Strategy.o .obj/Reactive_Flushing_Strategy.so .shobj/Reactive_Flushing_Strategy.o .shobj/Reactive_Flushing_Strategy.so: Reactive_Flushing_Strategy.cpp \ + Reactive_Flushing_Strategy.h \ + $(ACE_ROOT)/ace/pre.h \ + Flushing_Strategy.h corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(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/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 \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(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/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.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(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.i \ + $(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.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(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/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + TAO_Export.h \ + corbafwd.i \ + Transport.h Exception.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ + Transport.inl ORB_Core.h ORB.h \ + Exception.h \ + Services.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + Environment.h \ + Environment.i \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + PolicyC.h \ + CurrentC.h \ + Object.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ + CurrentC.i \ + Encodable.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Typecode.h \ + Typecode.i \ + PolicyC.i \ + ORB.i \ + Environment.h Policy_Manager.h \ + LocalObject.h \ + LocalObject.i \ + Policy_Manager.i \ + 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 \ + Pluggable.h \ + IOPC.h \ + IOPC.i \ + Pluggable.i \ + Protocol_Factory.h \ + params.h params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + TAO_Singleton.h \ + $(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_Singleton_Manager.h \ + Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ + DynamicC.h Any.h \ + Any.i DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ + ValueBase.h \ + ValueBase.i \ + ValueFactory.h \ + ValueFactory.i \ + TimeBaseC.h \ + TimeBaseC.i \ + PollableC.h \ + PollableC.i \ + MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i PolicyC.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.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 \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Connection_Cache_Manager.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.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ + Cache_Entries.h \ + Connection_Descriptor_Interface.h \ + Endpoint.h \ + Endpoint.i \ + Connection_Descriptor_Interface.inl \ + Cache_Entries.inl \ + Connection_Cache_Manager.inl \ + Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \ + Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \ + RTCORBAS.h \ + IOPS.h \ + IOPS_T.h \ + IOPS_T.i \ + IOPS_T.cpp \ + IOPS.i \ + TimeBaseS.h \ + TimeBaseS_T.h \ + TimeBaseS_T.i \ + TimeBaseS_T.cpp \ + TimeBaseS.i \ + RTCORBAC.h \ + RTCORBAC.i \ + RTCORBAS_T.h \ + RTCORBAS_T.i \ + RTCORBAS_T.cpp \ + RTCORBAS.i \ + RT_Policy_i.i \ + Protocols_Hooks.h RTCORBAC.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + ORB_Core.i Queued_Message.h Queued_Message.inl + +.obj/Queued_Message.o .obj/Queued_Message.so .shobj/Queued_Message.o .shobj/Queued_Message.so: Queued_Message.cpp Queued_Message.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(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/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 \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(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/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.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(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.i \ + $(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.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(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/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + TAO_Export.h \ + corbafwd.i \ + Queued_Message.inl Message_Sent_Callback.h Message_Sent_Callback.inl + .obj/iiop_endpoints.o .obj/iiop_endpoints.so .shobj/iiop_endpoints.o .shobj/iiop_endpoints.so: iiop_endpoints.cpp iiop_endpoints.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ @@ -3579,6 +4121,40 @@ realclean: $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ + Transport.inl \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.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/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(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/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -3587,10 +4163,6 @@ realclean: $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(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 \ @@ -3605,18 +4177,6 @@ realclean: $(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/Thread_Manager.h \ - $(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/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -3638,24 +4198,6 @@ realclean: $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - Transport.inl \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/QoS_Session.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.h \ @@ -6025,6 +6567,9 @@ realclean: Single_Reactor.i \ Priority_Mapping.h \ Priority_Mapping.i \ + Reactive_Flushing_Strategy.h \ + Flushing_Strategy.h \ + Block_Flushing_Strategy.h \ $(ACE_ROOT)/ace/TP_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor.h \ $(ACE_ROOT)/ace/Select_Reactor_T.h \ @@ -8823,8 +9368,7 @@ realclean: Typecode.h \ Typecode.i \ PolicyC.i \ - ORB.i \ - ORB_Table.h \ + ORB.i ORB_Table.h \ TAO_Singleton.h \ TAO_Singleton.inl \ TAO_Singleton.cpp \ @@ -8962,10 +9506,9 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i \ - ORB_Core.h Server_Strategy_Factory.h debug.h TAO_Internal.h \ - TAO_Export.h NVList.h \ - NVList.i \ + Stub.i ORB_Core.h \ + Server_Strategy_Factory.h debug.h TAO_Internal.h TAO_Export.h \ + NVList.h NVList.i \ Dynamic_Adapter.h CDR.h MProfile.h RT_ORB.h \ RT_ORB.i \ Priority_Mapping_Manager.h \ @@ -10183,8 +10726,7 @@ realclean: Invocation.i .obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp DomainC.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -10311,8 +10853,8 @@ realclean: PolicyC.i \ ClientRequestInfo.h PortableInterceptorC.h DynamicC.h \ Any.h \ - Any.i \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + Any.i DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -10443,8 +10985,8 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i \ - Any.h Synch_Reply_Dispatcher.h \ + Stub.i Any.h \ + Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ TAOC.h \ @@ -11180,8 +11722,7 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Endpoint.i \ - Stub.h \ + Endpoint.i Stub.h \ Pluggable.h \ Sequence.h \ Managed_Types.h \ @@ -11345,8 +11886,8 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i \ - Sequence.h Object.h Invocation.h CDR.h Any.h Synch_Reply_Dispatcher.h \ + Stub.i Sequence.h \ + Object.h Invocation.h CDR.h Any.h Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ TAOC.h \ @@ -11371,27 +11912,6 @@ realclean: Asynch_Invocation.i \ ORB_Core.h Client_Strategy_Factory.h TAO_Export.h Sync_Strategies.h \ Transport.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ Transport.inl \ TAOC.h \ Sync_Strategies.i \ @@ -12024,6 +12544,7 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ TAO_Export.h \ + orbconf.h \ TAO_Singleton_Manager.inl \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -12034,7 +12555,6 @@ realclean: $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/CDR_Base.inl \ try_macros.h \ - orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ corbafwd.i \ @@ -12590,9 +13110,8 @@ realclean: Typecode.i .obj/Protocols_Hooks.o .obj/Protocols_Hooks.so .shobj/Protocols_Hooks.o .shobj/Protocols_Hooks.so: Protocols_Hooks.cpp Protocols_Hooks.h \ - $(ACE_ROOT)/ace/pre.h \ - ORB_Core.h corbafwd.h \ - $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/pre.h ORB_Core.h \ + corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -12685,8 +13204,7 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - ORB.h \ + corbafwd.i ORB.h \ corbafwd.h \ Exception.h \ $(ACE_ROOT)/ace/SString.h \ @@ -12736,8 +13254,7 @@ realclean: IOPC.i \ Pluggable.i \ Protocol_Factory.h \ - params.h \ - params.i \ + params.h params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ @@ -12751,10 +13268,9 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h \ - Any.h \ - Any.i \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + DynamicC.h Any.h \ + Any.i DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -12933,8 +13449,7 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - ORB.h \ + corbafwd.i ORB.h \ corbafwd.h \ Exception.h \ $(ACE_ROOT)/ace/SString.h \ @@ -12984,8 +13499,7 @@ realclean: IOPC.i \ Pluggable.i \ Protocol_Factory.h \ - params.h \ - params.i \ + params.h params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ @@ -12999,10 +13513,9 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h \ - Any.h \ - Any.i \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + DynamicC.h Any.h \ + Any.i DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -13086,8 +13599,7 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/Invocation.o .obj/Invocation.so .shobj/Invocation.o .shobj/Invocation.so: Invocation.cpp Invocation.h \ - $(ACE_ROOT)/ace/pre.h \ - CDR.h \ + $(ACE_ROOT)/ace/pre.h CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -13185,8 +13697,7 @@ realclean: corbafwd.i \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - Stub.h \ + CDR.i Stub.h \ Pluggable.h \ Sequence.h \ Managed_Types.h \ @@ -13348,8 +13859,8 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i \ - Any.h Synch_Reply_Dispatcher.h \ + Stub.i Any.h \ + Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ TAOC.h \ @@ -13372,27 +13883,6 @@ realclean: Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ Dynamic_Adapter.h Object_KeyC.h debug.h Transport.h Exception.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ Transport.inl Pluggable.h Connector_Registry.h \ Connector_Registry.i \ Wait_Strategy.h Transport_Mux_Strategy.h Bind_Dispatcher_Guard.h \ @@ -14283,29 +14773,7 @@ realclean: Timeprobe.h \ $(ACE_ROOT)/ace/Timeprobe.h \ Transport_Mux_Strategy.h \ - Transport.h corbafwd.h Exception.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ - Transport.inl + Transport.h corbafwd.h Exception.h Transport.inl .obj/operation_details.o .obj/operation_details.so .shobj/operation_details.o .shobj/operation_details.so: operation_details.cpp \ operation_details.h \ @@ -14579,8 +15047,7 @@ realclean: PortableInterceptor.i .obj/ClientRequestInfo.o .obj/ClientRequestInfo.so .shobj/ClientRequestInfo.o .shobj/ClientRequestInfo.so: ClientRequestInfo.cpp ClientRequestInfo.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -14677,8 +15144,7 @@ realclean: corbafwd.i \ PortableInterceptorC.h \ corbafwd.h \ - DynamicC.h \ - Any.h \ + DynamicC.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -14839,8 +15305,8 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i \ - Any.h Synch_Reply_Dispatcher.h \ + Stub.i Any.h \ + Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ TAOC.h \ @@ -14861,8 +15327,7 @@ realclean: Invocation.i ClientRequestInfo.inl Tagged_Components.h .obj/RequestInfo_Util.o .obj/RequestInfo_Util.so .shobj/RequestInfo_Util.o .shobj/RequestInfo_Util.so: RequestInfo_Util.cpp RequestInfo_Util.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -15085,8 +15550,7 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - DynamicC.h \ - Any.h \ + DynamicC.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -15365,8 +15829,7 @@ realclean: Sequence_T.cpp \ Environment.h \ Environment.i \ - OctetSeqC.i \ - Any.h \ + OctetSeqC.i Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -15510,8 +15973,7 @@ realclean: Any.i .obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp ORB_Core.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -15605,8 +16067,7 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - ORB.h \ + corbafwd.i ORB.h \ corbafwd.h \ Exception.h \ $(ACE_ROOT)/ace/SString.h \ @@ -15656,8 +16117,7 @@ realclean: IOPC.i \ Pluggable.i \ Protocol_Factory.h \ - params.h \ - params.i \ + params.h params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ @@ -15671,10 +16131,9 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h \ - Any.h \ - Any.i \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + DynamicC.h Any.h \ + Any.i DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -15771,8 +16230,7 @@ realclean: GIOP_Message_State.h \ GIOP_Message_State.i \ Profile.i \ - MProfile.i \ - Stub.h \ + MProfile.i Stub.h \ MProfile.h \ ORB.h \ ORB_Core.h \ @@ -15788,27 +16246,6 @@ realclean: Acceptor_Registry.i \ Sync_Strategies.h \ Transport.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ Transport.inl \ TAOC.h \ Priority_Mapping_Manager.h \ @@ -15843,7 +16280,7 @@ realclean: Invocation.i RT_Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.h \ RT_Invocation_Endpoint_Selectors.i \ - IORInfo.h LocalObject.h + IORInfo.h LocalObject.h Flushing_Strategy.h .obj/ORB_Table.o .obj/ORB_Table.so .shobj/ORB_Table.o .shobj/ORB_Table.so: ORB_Table.cpp ORB_Table.h \ $(ACE_ROOT)/ace/pre.h \ @@ -15856,9 +16293,7 @@ realclean: $(ACE_ROOT)/ace/OS_Errno.h \ $(ACE_ROOT)/ace/OS_Export.h \ $(ACE_ROOT)/ace/OS_Errno.inl \ - TAO_Singleton.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/ACE.h \ + orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/OS_Dirent.h \ $(ACE_ROOT)/ace/OS_Dirent.inl \ @@ -15874,6 +16309,9 @@ realclean: $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + TAO_Singleton.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/Flag_Manip.h \ $(ACE_ROOT)/ace/Flag_Manip.i \ $(ACE_ROOT)/ace/Handle_Ops.h \ @@ -15978,11 +16416,9 @@ realclean: $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/CDR_Base.inl \ try_macros.h \ - orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ - corbafwd.i \ - ORB.h \ + corbafwd.i ORB.h \ corbafwd.h \ Exception.h \ Exception.i \ @@ -16026,13 +16462,12 @@ realclean: IOPC.i \ Pluggable.i \ Protocol_Factory.h \ - params.h \ - params.i \ + params.h params.i \ TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \ PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \ Any.h \ - Any.i \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + Any.i DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -17012,65 +17447,6 @@ realclean: $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/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.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/Thread_Manager.h \ - $(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/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.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(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/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 \ Transport.inl \ TAOC.h \ PolicyC.h \ @@ -17139,6 +17515,10 @@ realclean: Policy_Manager.h \ Policy_Manager.i \ 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 \ Protocol_Factory.h \ params.h \ params.i \ @@ -17147,6 +17527,11 @@ realclean: TAO_Singleton.h \ TAO_Singleton.inl \ 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 \ Adapter.h \ Adapter.i \ PolicyFactory_Registry.h \ @@ -17166,6 +17551,21 @@ realclean: $(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.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 \ Parser_Registry.h \ Parser_Registry.i \ Service_Callbacks.h \ @@ -17173,6 +17573,14 @@ realclean: Fault_Tolerance_Service.h \ Fault_Tolerance_Service.i \ Connection_Cache_Manager.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.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \ Cache_Entries.h \ Connection_Descriptor_Interface.h \ Endpoint.h \ @@ -17203,6 +17611,12 @@ realclean: RTCORBAS.i \ RT_Policy_i.i \ 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.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ Stub.i @@ -17674,29 +18088,7 @@ realclean: Pluggable_Messaging.i \ GIOP_Utils.h \ GIOP_Utils.i \ - Transport.h corbafwd.h Exception.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ - Transport.inl + Transport.h corbafwd.h Exception.h Transport.inl .obj/Typecode_Constants.o .obj/Typecode_Constants.so .shobj/Typecode_Constants.o .shobj/Typecode_Constants.so: Typecode_Constants.cpp \ Typecode.h \ @@ -18454,65 +18846,6 @@ realclean: $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/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.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/Thread_Manager.h \ - $(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/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.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(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/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 \ Transport.inl .obj/Wait_On_Reactor.o .obj/Wait_On_Reactor.so .shobj/Wait_On_Reactor.o .shobj/Wait_On_Reactor.so: Wait_On_Reactor.cpp \ @@ -18768,29 +19101,7 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Transport.h corbafwd.h Exception.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ - Transport.inl + Transport.h corbafwd.h Exception.h Transport.inl .obj/Wait_On_Leader_Follower.o .obj/Wait_On_Leader_Follower.so .shobj/Wait_On_Leader_Follower.o .shobj/Wait_On_Leader_Follower.so: Wait_On_Leader_Follower.cpp \ Wait_On_Leader_Follower.h \ @@ -19048,29 +19359,7 @@ realclean: Leader_Follower.h \ Leader_Follower.i \ debug.h \ - Transport.h corbafwd.h Exception.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ - Transport.inl + Transport.h corbafwd.h Exception.h Transport.inl .obj/Transport_Mux_Strategy.o .obj/Transport_Mux_Strategy.so .shobj/Transport_Mux_Strategy.o .shobj/Transport_Mux_Strategy.so: Transport_Mux_Strategy.cpp \ Transport_Mux_Strategy.h \ @@ -19311,65 +19600,6 @@ realclean: $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/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.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/Thread_Manager.h \ - $(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/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.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(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/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 \ Transport.inl .obj/Muxed_TMS.o .obj/Muxed_TMS.so .shobj/Muxed_TMS.o .shobj/Muxed_TMS.so: Muxed_TMS.cpp \ @@ -19525,37 +19755,6 @@ realclean: Pluggable_Messaging_Utils.i \ Transport.h corbafwd.h Exception.h \ Exception.i \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(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/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/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 \ Transport.inl .obj/Reply_Dispatcher.o .obj/Reply_Dispatcher.so .shobj/Reply_Dispatcher.o .shobj/Reply_Dispatcher.so: Reply_Dispatcher.cpp \ @@ -19932,29 +20131,7 @@ realclean: Wait_Strategy.h \ Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ - Transport.h corbafwd.h Exception.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ - Transport.inl + Transport.h corbafwd.h Exception.h Transport.inl .obj/Asynch_Reply_Dispatcher.o .obj/Asynch_Reply_Dispatcher.so .shobj/Asynch_Reply_Dispatcher.o .shobj/Asynch_Reply_Dispatcher.so: Asynch_Reply_Dispatcher.cpp \ Asynch_Reply_Dispatcher.h \ @@ -20216,29 +20393,7 @@ realclean: Leader_Follower.h \ Leader_Follower.i \ debug.h \ - Transport.h corbafwd.h Exception.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ - Transport.inl + Transport.h corbafwd.h Exception.h Transport.inl .obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h \ $(ACE_ROOT)/ace/pre.h \ @@ -20350,8 +20505,7 @@ realclean: Sequence_T.cpp \ Environment.h \ Environment.i \ - IOPC.i \ - Any.h \ + IOPC.i Any.h \ Object.h \ Abstract_Servant_Base.h \ Object_Proxy_Broker.h \ @@ -20366,8 +20520,7 @@ realclean: Any.i .obj/IOPS.o .obj/IOPS.so .shobj/IOPS.o .shobj/IOPS.so: IOPS.cpp IOPS.h \ - $(ACE_ROOT)/ace/pre.h \ - IOPC.h \ + $(ACE_ROOT)/ace/pre.h IOPC.h \ TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -20587,8 +20740,7 @@ realclean: CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - PollableC.i \ + CDR.i PollableC.i \ Stub.h \ Pluggable.h \ Sequence.h \ @@ -20872,8 +21024,8 @@ realclean: CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - PollableC.i PollableS_T.h PollableS_T.i PollableS_T.cpp PollableS.i + CDR.i PollableC.i \ + PollableS_T.h PollableS_T.i PollableS_T.cpp PollableS.i .obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.so .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.so: CONV_FRAMEC.cpp \ CONV_FRAMEC.h \ @@ -21738,8 +21890,7 @@ realclean: IOPC.i \ Object_KeyC.h \ Object_KeyC.i \ - GIOPC.i \ - GIOPS_T.h \ + GIOPC.i GIOPS_T.h \ GIOPS_T.i \ GIOPS_T.cpp \ GIOPS.i @@ -22003,8 +22154,7 @@ realclean: LocalObject.h \ LocalObject.i \ Priority_Mapping_Manager.i \ - TAOC.i \ - TAOS.h \ + TAOC.i TAOS.h \ TAOS_T.h \ TAOS_T.i \ TAOS_T.cpp \ @@ -22217,7 +22367,7 @@ realclean: $(ACE_ROOT)/ace/Dynamic_Service.cpp .obj/TAO_Singleton_Manager.o .obj/TAO_Singleton_Manager.so .shobj/TAO_Singleton_Manager.o .shobj/TAO_Singleton_Manager.so: TAO_Singleton_Manager.cpp \ - $(ACE_ROOT)/ace/Object_Manager.h \ + orbconf.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/post.h \ @@ -22242,6 +22392,7 @@ realclean: $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ @@ -22317,7 +22468,6 @@ realclean: $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/CDR_Base.inl \ try_macros.h \ - orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ corbafwd.i \ @@ -23879,8 +24029,7 @@ realclean: Pluggable.h \ Pluggable.i \ Protocol_Factory.h \ - params.h \ - params.i \ + params.h params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ @@ -23894,10 +24043,9 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h \ - Any.h \ - Any.i \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + DynamicC.h Any.h \ + Any.i DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -24097,8 +24245,7 @@ realclean: CORBANAME_Parser.i Invocation.h CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - Stub.h \ + CDR.i Stub.h \ Pluggable.h \ Sequence.h \ Managed_Types.h \ @@ -24237,8 +24384,8 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Stub.i \ - Any.h Synch_Reply_Dispatcher.h \ + Stub.i Any.h \ + Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ TAOC.h \ @@ -24785,8 +24932,7 @@ realclean: CORBA_String.inl .obj/ORBInitInfo.o .obj/ORBInitInfo.so .shobj/ORBInitInfo.o .shobj/ORBInitInfo.so: ORBInitInfo.cpp ORBInitInfo.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -24883,8 +25029,7 @@ realclean: corbafwd.i \ PortableInterceptorC.h \ corbafwd.h \ - DynamicC.h \ - Any.h \ + DynamicC.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -24945,8 +25090,7 @@ realclean: Pluggable.h \ Pluggable.i \ Protocol_Factory.h \ - params.h \ - params.i \ + params.h params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ @@ -25031,8 +25175,7 @@ realclean: .obj/ORBInitializer_Registry.o .obj/ORBInitializer_Registry.so .shobj/ORBInitializer_Registry.o .shobj/ORBInitializer_Registry.so: ORBInitializer_Registry.cpp \ ORBInitializer_Registry.h \ - $(ACE_ROOT)/ace/pre.h \ - TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -25129,8 +25272,7 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - DynamicC.h \ - Any.h \ + DynamicC.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -25184,8 +25326,7 @@ realclean: TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ ORBInitializer_Registry.inl \ - ORB.h \ - Services.h \ + ORB.h Services.h \ Services.i \ CORBA_String.h \ CORBA_String.inl \ @@ -25194,8 +25335,7 @@ realclean: .obj/PolicyFactory_Registry.o .obj/PolicyFactory_Registry.so .shobj/PolicyFactory_Registry.o .shobj/PolicyFactory_Registry.so: PolicyFactory_Registry.cpp \ PolicyFactory_Registry.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -25292,8 +25432,7 @@ realclean: corbafwd.i \ PortableInterceptorC.h \ corbafwd.h \ - DynamicC.h \ - Any.h \ + DynamicC.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -25833,8 +25972,7 @@ realclean: .obj/Cleanup_Func_Registry.o .obj/Cleanup_Func_Registry.so .shobj/Cleanup_Func_Registry.o .shobj/Cleanup_Func_Registry.so: Cleanup_Func_Registry.cpp \ Cleanup_Func_Registry.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -26034,8 +26172,7 @@ realclean: Connection_Descriptor_Interface.inl .obj/IORInfo.o .obj/IORInfo.so .shobj/IORInfo.o .shobj/IORInfo.so: IORInfo.cpp IORInfo.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -26132,8 +26269,7 @@ realclean: corbafwd.i \ PortableInterceptorC.h \ corbafwd.h \ - DynamicC.h \ - Any.h \ + DynamicC.h Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -26189,8 +26325,7 @@ realclean: MProfile.i .obj/Object_Ref_Table.o .obj/Object_Ref_Table.so .shobj/Object_Ref_Table.o .shobj/Object_Ref_Table.so: Object_Ref_Table.cpp Object_Ref_Table.h \ - $(ACE_ROOT)/ace/pre.h \ - corbafwd.h \ + $(ACE_ROOT)/ace/pre.h corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -29772,7 +29907,36 @@ realclean: RTCORBAS_T.cpp \ RTCORBAS.i \ LocalObject.h \ - LocalObject.i + LocalObject.i \ + RT_ORB.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.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.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.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 \ + RT_ORB.i .obj/RT_Policy_i.o .obj/RT_Policy_i.so .shobj/RT_Policy_i.o .shobj/RT_Policy_i.so: RT_Policy_i.cpp \ RT_Policy_i.h \ @@ -30178,10 +30342,37 @@ realclean: RTCORBAS.i \ LocalObject.h \ LocalObject.i \ + $(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.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.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.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 \ RT_ORB.i \ RT_Policy_i.h \ RT_Policy_i.i \ - RT_Mutex.h + RT_Mutex.h .obj/RT_ORB_Loader.o .obj/RT_ORB_Loader.so .shobj/RT_ORB_Loader.o .shobj/RT_ORB_Loader.so: RT_ORB_Loader.cpp RT_ORB_Loader.h \ $(ACE_ROOT)/ace/pre.h \ @@ -30436,8 +30627,7 @@ realclean: ORB_Core.i \ Object_Loader.h \ Object_Loader.i \ - RT_ORB.h \ - RT_ORB.i \ + RT_ORB.h RT_ORB.i \ RT_Current.h \ RT_Current.i \ Priority_Mapping_Manager.h \ @@ -30541,8 +30731,7 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - ORB.h \ + corbafwd.i ORB.h \ corbafwd.h \ Exception.h \ $(ACE_ROOT)/ace/SString.h \ @@ -30592,8 +30781,7 @@ realclean: IOPC.i \ Pluggable.i \ Protocol_Factory.h \ - params.h \ - params.i \ + params.h params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ @@ -30607,10 +30795,9 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h \ - Any.h \ - Any.i \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + DynamicC.h Any.h \ + Any.i DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -30686,9 +30873,7 @@ realclean: $(ACE_ROOT)/ace/Singleton.i \ $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ - ORB_Core.i RTCORBAC.h RT_Protocols_Hooks.i \ - Invocation.h \ - Stub.h \ + ORB_Core.i RTCORBAC.h RT_Protocols_Hooks.i Invocation.h CDR.h Stub.h \ MProfile.h \ Profile.h \ Tagged_Components.h \ @@ -30701,7 +30886,7 @@ realclean: MProfile.i \ ORB.h \ ORB_Core.h \ - Stub.i \ + Stub.i Any.h \ Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ @@ -30710,8 +30895,7 @@ realclean: Priority_Mapping.h \ Priority_Mapping.i \ Priority_Mapping_Manager.i \ - TAOC.i \ - operation_details.h \ + TAOC.i operation_details.h \ Service_Context.h \ Service_Context.inl \ target_specification.h \ @@ -30719,9 +30903,9 @@ realclean: Object_KeyC.i \ target_specification.i \ operation_details.i \ - Invocation_Endpoint_Selectors.h \ + target_specification.h Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ - Invocation.i \ + Invocation.i MProfile.h Priority_Mapping_Manager.h \ $(ACE_ROOT)/ace/Dynamic_Service.h \ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ $(ACE_ROOT)/ace/Dynamic_Service.i \ @@ -31117,10 +31301,8 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - IOPC.h \ + corbafwd.i IOPC.h \ CDR.h \ - corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ @@ -31133,8 +31315,7 @@ realclean: Sequence_T.cpp \ Environment.h \ Environment.i \ - IOPC.i \ - PolicyC.h \ + IOPC.i PolicyC.h \ CurrentC.h \ Object.h \ Abstract_Servant_Base.h \ @@ -31150,16 +31331,17 @@ realclean: Typecode.h \ Typecode.i \ PolicyC.i \ - TimeBaseC.h \ - Any.h \ + TimeBaseC.h Any.h \ Any.i \ TimeBaseC.i \ - RTCORBAC.i \ - TAOS.h \ + RTCORBAC.i TAOS.h \ TAOS_T.h \ TAOS_T.i \ TAOS_T.cpp \ - TAOS.i + TAOS.i \ + RequestInfo_Util.h \ + DynamicC.h \ + DynamicC.i .obj/RTCORBAS.o .obj/RTCORBAS.so .shobj/RTCORBAS.o .shobj/RTCORBAS.so: RTCORBAS.cpp \ orbconf.h \ @@ -31186,8 +31368,8 @@ realclean: $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - RTCORBAS.h orbconf.h IOPS.h IOPC.h \ + $(ACE_ROOT)/ace/OS.i RTCORBAS.h \ + orbconf.h IOPS.h IOPC.h \ TAO_Export.h \ CDR.h \ corbafwd.h \ @@ -31292,14 +31474,92 @@ realclean: TimeBaseS_T.i \ TimeBaseS_T.cpp \ TimeBaseS.i \ - RTCORBAC.h corbafwd.h \ + RTCORBAC.h \ PolicyC.h \ CurrentC.h \ CurrentC.i \ Encodable.h \ PolicyC.i \ TimeBaseC.h RTCORBAC.i RTCORBAS_T.h RTCORBAS_T.i RTCORBAS_T.cpp \ - RTCORBAS.i + RTCORBAS.i \ + PortableServer/Object_Adapter.h \ + PortableServer/portableserver_export.h \ + PortableServer/Key_Adapters.h \ + PortableServer/PortableServerC.h \ + PortableServer/PortableServerC.i \ + $(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.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/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.i \ + $(ACE_ROOT)/ace/Functor_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ + $(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 \ + PortableServer/Key_Adapters.i \ + PortableServer/poa_macros.h \ + PortableServer/RTPortableServerC.h \ + RTCORBAC.h \ + PortableServer/RTPortableServerC.i \ + PortableServer/Servant_Base.h \ + PortableServer/Servant_Base.i \ + PortableServer/Active_Object_Map.h \ + Server_Strategy_Factory.h \ + PortableServer/Active_Object_Map.i \ + Adapter.h \ + Adapter.i \ + LocalObject.h \ + LocalObject.i \ + PortableServer/Object_Adapter.i \ + PortableServer/Operation_Table.h \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + 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_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + RequestInfo_Util.h \ + DynamicC.h \ + DynamicC.i .obj/RT_PolicyFactory.o .obj/RT_PolicyFactory.so .shobj/RT_PolicyFactory.o .shobj/RT_PolicyFactory.so: RT_PolicyFactory.cpp \ RT_PolicyFactory.h \ @@ -31833,6 +32093,113 @@ realclean: Connection_Descriptor_Interface.inl \ Private_Connection_Descriptor.inl +.obj/IFR_Client_Adapter.o .obj/IFR_Client_Adapter.so .shobj/IFR_Client_Adapter.o .shobj/IFR_Client_Adapter.so: IFR_Client_Adapter.cpp \ + IFR_Client_Adapter.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(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/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 \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(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/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.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(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.i \ + $(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.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(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/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ + $(ACE_ROOT)/ace/CDR_Base.inl \ + try_macros.h \ + orbconf.h \ + $(ACE_ROOT)/ace/CORBA_macros.h \ + varbase.h \ + TAO_Export.h \ + corbafwd.i \ + $(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/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service_Base.h \ + $(ACE_ROOT)/ace/Dynamic_Service.i \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp + .obj/IFR_TypeCodes.o .obj/IFR_TypeCodes.so .shobj/IFR_TypeCodes.o .shobj/IFR_TypeCodes.so: IFR_TypeCodes.cpp \ corbafwd.h \ $(ACE_ROOT)/ace/pre.h \ @@ -32487,8 +32854,7 @@ realclean: $(ACE_ROOT)/ace/Service_Object.i \ Pluggable.h \ Protocol_Factory.h \ - params.h \ - params.i \ + params.h params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ @@ -32502,10 +32868,9 @@ realclean: $(ACE_ROOT)/ace/Managed_Object.cpp \ TAO_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h \ - Any.h \ - Any.i \ - DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \ + DynamicC.h Any.h \ + Any.i DynamicC.i \ + MessagingC.h Remote_Object_Proxy_Impl.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -32593,29 +32958,7 @@ realclean: TAO_Server_Request.i GIOP_Message_Locate_Header.h \ Tagged_Profile.h \ GIOP_Message_Headers.i \ - Transport.h Exception.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ - Transport.inl + Transport.h Exception.h Transport.inl .obj/GIOP_Message_Lite.o .obj/GIOP_Message_Lite.so .shobj/GIOP_Message_Lite.o .shobj/GIOP_Message_Lite.so: GIOP_Message_Lite.cpp \ GIOP_Message_Lite.h \ @@ -32905,29 +33248,7 @@ realclean: GIOP_Message_Headers.i \ Leader_Follower.h \ Leader_Follower.i \ - Transport.h corbafwd.h Exception.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ - Transport.inl + Transport.h corbafwd.h Exception.h Transport.inl .obj/GIOP_Message_Handler.o .obj/GIOP_Message_Handler.so .shobj/GIOP_Message_Handler.o .shobj/GIOP_Message_Handler.so: GIOP_Message_Handler.cpp \ GIOP_Message_Handler.h \ @@ -33203,29 +33524,7 @@ realclean: GIOP_Utils.h \ GIOP_Utils.i \ GIOP_Message_Base.i \ - Transport.h corbafwd.h Exception.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ - Transport.inl + Transport.h corbafwd.h Exception.h Transport.inl .obj/GIOP_Message_Generator_Parser.o .obj/GIOP_Message_Generator_Parser.so .shobj/GIOP_Message_Generator_Parser.o .shobj/GIOP_Message_Generator_Parser.so: GIOP_Message_Generator_Parser.cpp \ GIOP_Message_Generator_Parser.h \ @@ -33507,8 +33806,8 @@ realclean: CDR.h Any.h \ Typecode.h \ Typecode.i \ - Any.i \ - debug.h OctetSeqC.h OctetSeqC.i Pluggable_Messaging_Utils.h \ + Any.i debug.h \ + OctetSeqC.h OctetSeqC.i Pluggable_Messaging_Utils.h \ Pluggable_Messaging_Utils.i \ TAO_Server_Request.h corbafwd.h Tagged_Profile.h Service_Context.h \ Object.h TAO_Server_Request.i GIOP_Message_State.h \ @@ -33912,29 +34211,7 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Transport.h corbafwd.h Exception.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ - Transport.inl + Transport.h corbafwd.h Exception.h Transport.inl .obj/GIOP_Message_Generator_Parser_Impl.o .obj/GIOP_Message_Generator_Parser_Impl.so .shobj/GIOP_Message_Generator_Parser_Impl.o .shobj/GIOP_Message_Generator_Parser_Impl.so: \ GIOP_Message_Generator_Parser_Impl.cpp \ @@ -34303,29 +34580,7 @@ realclean: $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Thread_Manager.i \ ORB_Core.i \ - Transport.h corbafwd.h Exception.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue_T.h \ - $(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/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(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/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 \ - Transport.inl + Transport.h corbafwd.h Exception.h Transport.inl .obj/GIOP_Message_Locate_Header.o .obj/GIOP_Message_Locate_Header.so .shobj/GIOP_Message_Locate_Header.o .shobj/GIOP_Message_Locate_Header.so: GIOP_Message_Locate_Header.cpp \ GIOP_Message_Headers.h \ diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index d7a80ca00a0..8024d0a922a 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -475,8 +475,7 @@ CPPFLAGS += -I$(TAO_ROOT) Object_Adapter.i POAManager.h POAManager.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - POA.i \ - $(TAO_ROOT)/tao/ORB.h \ + POA.i $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -1937,8 +1936,8 @@ CPPFLAGS += -I$(TAO_ROOT) POA.i .obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp Active_Object_Map.h \ - $(ACE_ROOT)/ace/pre.h \ - Key_Adapters.h PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h Key_Adapters.h \ + PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2247,8 +2246,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i Servant_Base.i POA.h Object_Adapter.h \ - Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ + 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 \ @@ -3346,8 +3344,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i Servant_Base.i Collocated_Object.i Object_Adapter.h \ - Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ + 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 \ @@ -4419,8 +4416,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Invocation.i .obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h \ - $(ACE_ROOT)/ace/pre.h \ - ImplRepoC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h ImplRepoC.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4742,8 +4739,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - MessagingS.h \ + $(ACE_ROOT)/ace/OS.i MessagingS.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -4971,15 +4967,15 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB_Core.i \ PortableServerC.h portableserver_export.h PortableServerC.i \ Servant_Base.h Servant_Base.i Collocated_Object.h Collocated_Object.i \ - ThruPOA_Object_Proxy_Impl.h \ - portableserver_export.h \ - Direct_Object_Proxy_Impl.h \ - ServerRequestInfo.h \ + $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ + $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ - ServerRequestInfo.inl \ + $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \ MessagingS_T.h MessagingS_T.i MessagingS_T.cpp MessagingS.i \ Operation_Table.h Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp index d2613ca902b..21b7737d93a 100644 --- a/TAO/tao/Queued_Message.cpp +++ b/TAO/tao/Queued_Message.cpp @@ -11,8 +11,10 @@ ACE_RCSID(tao, Queued_Message, "$Id$") TAO_Queued_Message::TAO_Queued_Message (ACE_Message_Block *contents, + int own_contents, TAO_Message_Sent_Callback *callback) : contents_ (contents) + , own_contents_ (own_contents) , callback_ (callback) , next_ (0) , prev_ (0) @@ -21,12 +23,15 @@ TAO_Queued_Message::TAO_Queued_Message (ACE_Message_Block *contents, TAO_Queued_Message::~TAO_Queued_Message (void) { - ACE_Message_Block *i = this->contents_; - while (i != 0) + if (this->own_contents_) { - ACE_Message_Block *cont = i->cont (); i->cont (0); - ACE_Message_Block::release (i); - i = cont; + ACE_Message_Block *i = this->contents_; + while (i != 0) + { + ACE_Message_Block *cont = i->cont (); i->cont (0); + ACE_Message_Block::release (i); + i = cont; + } } } @@ -34,7 +39,16 @@ void TAO_Queued_Message::connection_closed (void) { if (this->callback_ != 0) - this->callback_->connection_closed (); + { + if (this->done ()) + { + this->callback_->connection_closed (); + } + else + { + this->callback_->send_failed (); + } + } } void @@ -46,7 +60,7 @@ TAO_Queued_Message::destroy (void) void TAO_Queued_Message::bytes_transferred (size_t byte_count) { - while (byte_count > 0 && !this->done ()) + while (!this->done () && byte_count > 0) { size_t l = this->contents_->length (); if (byte_count < l) @@ -56,7 +70,11 @@ TAO_Queued_Message::bytes_transferred (size_t byte_count) } ACE_Message_Block *cont = this->contents_->cont (); byte_count -= l; - ACE_Message_Block::release (this->contents_); + if (this->own_contents_) + { + this->contents_->cont (0); + ACE_Message_Block::release (this->contents_); + } this->contents_ = cont; } } diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h index ddb66a92e7f..8b194bd162e 100644 --- a/TAO/tao/Queued_Message.h +++ b/TAO/tao/Queued_Message.h @@ -66,14 +66,17 @@ class TAO_Export TAO_Queued_Message public: /// Constructor /** - * @param contents The message block chain that must be sent, this - * class <B>always</B> assumes ownership of the chain. + * @param contents The message block chain that must be sent. + * + * @param own_contents If this flag is true then this object assumes + * ownership of the contents. * * @param callback A callback interface to signal any waiting * threads about the status of the message. It is null if there are * no waiting threads. */ TAO_Queued_Message (ACE_Message_Block *contents, + int own_contents, TAO_Message_Sent_Callback *callback = 0); /// Destructor @@ -149,6 +152,9 @@ private: */ ACE_Message_Block *contents_; + /// If not zero the @c contents_ are owned by this object + int own_contents_; + /// If not null, this is the object that we signal to indicate that /// the message was sent. /** diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile index dbc6ad75d71..fc7bb0764b0 100644 --- a/TAO/tao/Strategies/Makefile +++ b/TAO/tao/Strategies/Makefile @@ -912,6 +912,50 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Object_KeyC.i \ UIOP_Connection_Handler.h UIOP_Transport.h \ $(TAO_ROOT)/tao/Transport.h \ + $(TAO_ROOT)/tao/Transport.inl \ + $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/UNIX_Addr.h \ + $(ACE_ROOT)/ace/UNIX_Addr.i \ + $(ACE_ROOT)/ace/LSOCK_Stream.h \ + $(ACE_ROOT)/ace/LSOCK.h \ + $(ACE_ROOT)/ace/LSOCK.i \ + $(ACE_ROOT)/ace/LSOCK_Stream.i \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.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/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(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/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -920,10 +964,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(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 \ @@ -938,18 +978,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Thread_Manager.h \ - $(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/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -971,34 +999,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(TAO_ROOT)/tao/Transport.inl \ - $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/QoS_Session.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/UNIX_Addr.h \ - $(ACE_ROOT)/ace/UNIX_Addr.i \ - $(ACE_ROOT)/ace/LSOCK_Stream.h \ - $(ACE_ROOT)/ace/LSOCK.h \ - $(ACE_ROOT)/ace/LSOCK.i \ - $(ACE_ROOT)/ace/LSOCK_Stream.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.h \ @@ -1207,6 +1207,51 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Transport.inl \ + strategies_export.h \ + $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/UNIX_Addr.h \ + $(ACE_ROOT)/ace/UNIX_Addr.i \ + $(ACE_ROOT)/ace/LSOCK_Stream.h \ + $(ACE_ROOT)/ace/LSOCK.h \ + $(ACE_ROOT)/ace/LSOCK.i \ + $(ACE_ROOT)/ace/LSOCK_Stream.i \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.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/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(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/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -1215,10 +1260,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(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 \ @@ -1233,18 +1274,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Thread_Manager.h \ - $(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/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -1266,35 +1295,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(TAO_ROOT)/tao/Transport.inl \ - strategies_export.h \ - $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/QoS_Session.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/UNIX_Addr.h \ - $(ACE_ROOT)/ace/UNIX_Addr.i \ - $(ACE_ROOT)/ace/LSOCK_Stream.h \ - $(ACE_ROOT)/ace/LSOCK.h \ - $(ACE_ROOT)/ace/LSOCK.i \ - $(ACE_ROOT)/ace/LSOCK_Stream.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.h \ @@ -2269,6 +2269,51 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Transport.inl \ + strategies_export.h \ + $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/UNIX_Addr.h \ + $(ACE_ROOT)/ace/UNIX_Addr.i \ + $(ACE_ROOT)/ace/LSOCK_Stream.h \ + $(ACE_ROOT)/ace/LSOCK.h \ + $(ACE_ROOT)/ace/LSOCK.i \ + $(ACE_ROOT)/ace/LSOCK_Stream.i \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.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/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(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/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -2277,10 +2322,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(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 \ @@ -2295,18 +2336,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Thread_Manager.h \ - $(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/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -2328,35 +2357,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(TAO_ROOT)/tao/Transport.inl \ - strategies_export.h \ - $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/QoS_Session.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/UNIX_Addr.h \ - $(ACE_ROOT)/ace/UNIX_Addr.i \ - $(ACE_ROOT)/ace/LSOCK_Stream.h \ - $(ACE_ROOT)/ace/LSOCK.h \ - $(ACE_ROOT)/ace/LSOCK.i \ - $(ACE_ROOT)/ace/LSOCK_Stream.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.h \ @@ -2616,6 +2616,46 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Transport.inl \ + $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/QoS_Session.h \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/LSOCK_Stream.h \ + $(ACE_ROOT)/ace/LSOCK.h \ + $(ACE_ROOT)/ace/LSOCK.i \ + $(ACE_ROOT)/ace/LSOCK_Stream.i \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.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/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(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/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -2624,10 +2664,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(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 \ @@ -2642,18 +2678,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(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/Thread_Manager.h \ - $(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/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -2675,30 +2699,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(TAO_ROOT)/tao/Transport.inl \ - $(ACE_ROOT)/ace/LSOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/QoS_Session.h \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/LSOCK_Stream.h \ - $(ACE_ROOT)/ace/LSOCK.h \ - $(ACE_ROOT)/ace/LSOCK.i \ - $(ACE_ROOT)/ace/LSOCK_Stream.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.h \ diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index a9fc19e0d3d..5a72f7501e8 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -299,8 +299,20 @@ TAO_Transport::send_message_i (TAO_Stub *stub, // ... the message was only partially sent, set it as the // current message ... - queued_message = - new TAO_Queued_Message (message_block->clone ()); + if (twoway_flag) + { + // ... we are going to block, so there is no need to clone + // the message block... + queued_message = + new TAO_Queued_Message ( + ACE_const_cast(ACE_Message_Block*,message_block), + 0); + } + else + { + queued_message = + new TAO_Queued_Message (message_block->clone (), 1); + } // @@ Revisit message queue allocations queued_message->bytes_transferred (byte_count); @@ -310,7 +322,7 @@ TAO_Transport::send_message_i (TAO_Stub *stub, { // ... otherwise simply queue the message ... queued_message = - new TAO_Queued_Message (message_block->clone ()); + new TAO_Queued_Message (message_block->clone (), 1); queued_message->push_back (this->head_, this->tail_); } diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile index 7191e3b7970..2e1836809b5 100644 --- a/TAO/tests/Makefile +++ b/TAO/tests/Makefile @@ -52,7 +52,8 @@ DIRS = CDR \ Single_Read \ QtTests \ Multiple \ - LongWrites + LongWrites \ + Queued_Message_Test ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/tests/Queued_Message_Test/Makefile b/TAO/tests/Queued_Message_Test/Makefile new file mode 100644 index 00000000000..176100a9d75 --- /dev/null +++ b/TAO/tests/Queued_Message_Test/Makefile @@ -0,0 +1,154 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +ifndef TAO_ROOT + TAO_ROOT = $(ACE_ROOT)/TAO +endif # ! TAO_ROOT + +LDLIBS = -lTAO + +IDL_FILES = +IDL_SRC = +BIN = Queued_Message_Test + +SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC) + +QUEUED_MESSAGE_OBJS = Queued_Message_Test.o + +TAO_IDLFLAGS += -Ge 1 +#---------------------------------------------------------------------------- +# Include macros and targets +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU +include $(ACE_ROOT)/include/makeinclude/rules.common.GNU +include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU +include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +include $(TAO_ROOT)/taoconfig.mk + +#---------------------------------------------------------------------------- +# Local targets +#---------------------------------------------------------------------------- + +.PRECIOUS: $(foreach ext, $(IDL_EXT), Test$(ext)) + +Queued_Message_Test: $(addprefix $(VDIR),$(QUEUED_MESSAGE_OBJS)) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) + +realclean: clean + -$(RM) $(foreach ext, $(IDL_EXT), Test$(ext)) + +# DO NOT DELETE THIS LINE -- g++dep uses it. +# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. + + +.obj/Queued_Message_Test.o .obj/Queued_Message_Test.so .shobj/Queued_Message_Test.o .shobj/Queued_Message_Test.so: Queued_Message_Test.cpp \ + $(TAO_ROOT)/tao/Queued_Message.h \ + $(ACE_ROOT)/ace/pre.h \ + $(TAO_ROOT)/tao/corbafwd.h \ + $(ACE_ROOT)/ace/CDR_Base.h \ + $(ACE_ROOT)/ace/post.h \ + $(ACE_ROOT)/ace/ACE_export.h \ + $(ACE_ROOT)/ace/svc_export.h \ + $(ACE_ROOT)/ace/ace_wchar.h \ + $(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/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 \ + $(ACE_ROOT)/ace/Handle_Ops.i \ + $(ACE_ROOT)/ace/Lib_Find.h \ + $(ACE_ROOT)/ace/Lib_Find.i \ + $(ACE_ROOT)/ace/Init_ACE.h \ + $(ACE_ROOT)/ace/Init_ACE.i \ + $(ACE_ROOT)/ace/Sock_Connect.h \ + $(ACE_ROOT)/ace/Sock_Connect.i \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Malloc.h \ + $(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/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.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread_Adapter.h \ + $(ACE_ROOT)/ace/Base_Thread_Adapter.h \ + $(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.i \ + $(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.i \ + $(ACE_ROOT)/ace/Containers_T.h \ + $(ACE_ROOT)/ace/Containers_T.i \ + $(ACE_ROOT)/ace/Containers_T.cpp \ + $(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/Memory_Pool.i \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(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/corbafwd.i \ + $(TAO_ROOT)/tao/Queued_Message.inl + +# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp new file mode 100644 index 00000000000..190e2e94cd8 --- /dev/null +++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp @@ -0,0 +1,137 @@ +// ============================================================================ +/** + * @brief Unit test for the TAO_Queued_Message class + * + * $Id$ + * + * @author Carlos O'Ryan <coryan@uci.edu> + */ +// ============================================================================ + +#include "tao/Queued_Message.h" + +ACE_RCSID(tests, Queued_Message_Test, "$Id$") + +/// Max number of bytes on each message block +const size_t max_block_length = 256; + +/// Create a message block chain of at most 64 elements +const size_t max_chain_length = 64; + +/// Add a new message at the tail of the queue. +static void add_message (TAO_Queued_Message *&head, + TAO_Queued_Message *&tail, + ACE_RANDR_TYPE &seed) +{ + // ACE_DEBUG ((LM_DEBUG, "Adding message\n")); + // First build a message block chain + size_t chain_length = + 1 + ACE_OS::rand_r(seed) % max_chain_length; + ACE_Message_Block *mb = 0; + for (size_t j = 0; j != chain_length; ++j) + { + size_t block_size = + 64 + ACE_OS::rand_r(seed) % (max_block_length - 64); + ACE_Message_Block *cont = mb; + mb = new ACE_Message_Block (block_size); + mb->wr_ptr (block_size); + mb->cont (cont); + } + TAO_Queued_Message *msg = + new TAO_Queued_Message (mb, 1); + msg->push_back (head, tail); +} + +/// Remove the message at the head of the queue, and simulate the +/// behavior of the I/O subsystem when processing such messages. +static void del_message (TAO_Queued_Message *&head, + TAO_Queued_Message *&tail, + ACE_RANDR_TYPE &seed) +{ + if (head == 0) + return; + + // ACE_DEBUG ((LM_DEBUG, "Removing message\n")); + TAO_Queued_Message *current = head; + current->remove_from_list (head, tail); + + // Simulate message writing: each message is 'sent' using + // multiple write() calls, in this simulation, we call the + // bytes_transferred() method until all messages are removed. + + size_t total_length = current->mb ()->total_length (); + while (total_length > 0) + { + // select how many bytes we want to 'send' in this iteration. + size_t t = ACE_OS::rand_r(seed) % 256 + 1; + if (t > total_length) + t = total_length; + + current->bytes_transferred (t); + total_length -= t; + } + if (!current->done ()) + { + ACE_ERROR ((LM_DEBUG, + "ERROR: inconsistent state in Queued_Message\n")); + ACE_OS::exit (1); + } + current->destroy (); +} + +int +main (int, ACE_TCHAR *[]) +{ + + // Initialize a random seed to get better coverage. + // @@ The random seed and default values should be configurable + // using command line options. + + ACE_hrtime_t current_hrtime = ACE_OS::gethrtime (); + ACE_UINT32 low_bits = + ACE_CU64_TO_CU32(current_hrtime); + ACE_RANDR_TYPE seed = + ACE_static_cast(ACE_RANDR_TYPE,low_bits); + + ACE_DEBUG ((LM_DEBUG, "Running test SEED = %d\n", seed)); + + TAO_Queued_Message *head = 0; + TAO_Queued_Message *tail = 0; + + const int iterations = 100; + int i; + for (i = 0; i != iterations; ++i) + { + add_message (head, tail, seed); + if (ACE_OS::rand_r(seed) % 100 > 90) + { + // every so often remove a message also. + del_message (head, tail, seed); + } + } + + // second phase, change the probabilities of removing a message. + for (i = 0; i != iterations; ++i) + { + if (ACE_OS::rand_r(seed) % 100 > 90) + { + add_message (head, tail, seed); + } + del_message (head, tail, seed); + } + + // Go through a phase where all messages are removed. + while (head != 0) + { + del_message (head, tail, seed); + } + + if (tail != 0) + { + ACE_ERROR_RETURN ((LM_ERROR, + "ERROR: inconsistent state in message queue\n"), + 1); + } + + return 0; +} |