diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-31 02:16:46 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-10-31 02:16:46 +0000 |
| commit | bc73c0ad3fcb1f9f32b9ef160e8b59a302065635 (patch) | |
| tree | 1a512de20373eb624d52cf1b97930391e11f35ba | |
| parent | b0aff2ca032976d1f4972e59afb576d43b1838ec (diff) | |
| download | ATCD-bc73c0ad3fcb1f9f32b9ef160e8b59a302065635.tar.gz | |
ChangeLogTag: Mon Oct 30 17:47:13 2000 Priyanka Gontla <pgontla@ece.uci.edu>
32 files changed, 938 insertions, 803 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 83e5928b649..8e3d7a78025 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,102 @@ +Mon Oct 30 17:47:13 2000 Priyanka Gontla <pgontla@ece.uci.edu> + + * tao/Policy_Manager.h: + * tao/Policy_Manager.cpp (TAO_Policy_Manager_Impl): + Changed the type of relative_roundtrip_timeout_ and sync_scope_ to + CORBA::Policy *. + Hence instead of calling TAO_RelativeTimeoutPolicy::clone or + TAO_Sync_Scope_Policy::clone, calling CORBA::Policy::copy. + Made related changes. + + Modify the return parameter for + relative_roundtrip_timeout () and sync_scope () to + CORBA::Policy_ptr in all the classes in the file. + + * tao/ORB_Core.h : + * tao/ORB_Core.cpp: + Declare and define TAO_ORB_Core::call_timeout_hook, + TAO_ORB_Core::set_timeout_hook, + TAO_ORB_Core::call_sync_scope_hook, + TAO_ORB_Core::set_sync_scope_hook which are used to call the + hooks to set and get the values of timeout/scope and save the + hook for the respective policies so that they can be used later + in need. + + Also, get_sync_strategy is defined as a helper to get the + TAO_Sync_Strategy related to the Sync_Scope passed to it. + + The function TAO_ORB_Core::stubless_sync_scope helps get the + scope when the stub is nil. + + Modify the return parameter for + TAO_ORB_Core::relative_roundtrip_timeout (), + TAO_ORB_Core::default_relative_roundtrip_timeout (), + TAO_ORB_Core::stubless_relative_roundtrip_timeout (), + TAO_ORB_Core::default_sync_scope () and + TAO_ORB_Core::sync_scope () to CORBA::Policy_ptr. + + The same change recursively in all the classes which call these + functions. + + * tao/Stub.h: + * tao/Stub.cpp (sync_scope): + Modified TAO_Stub::sync_strategy () to call + TAO_ORB_Core::call_sync_scope_hook to get the scope value. + This scope value is passed to TAO_ORB_Core::get_sync_strategy () + to get the TAO_Sync_Strategy. + + Modify the return parameter for + TAO_ORB_Core::relative_roundtrip_timeout (), + TAO_ORB_Core::sync_scope () to CORBA::Policy_ptr. + + Modified TAO::Sync_scope to call + TAO_ORB_Core::stubless_sync_scope to avoid code repetition. + + * tao/Messaging_Policy_i.h (SyncScopePolicy,): + * tao/Messaging_Policy_i.cpp: + Declare and define TAO_RelativeRoundtripTimeoutPolicy::hook + and TAO_Sync_Scope_Policy::hook functions. The + functions are called to set the hooks for the respective policies + to indicate that the policies are set and also to know the Timeout + and scope values in the respective cases. + + * tao/Messaging_PolicyFactory.cpp (create_policy): + Remove the if-defs for TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY + and TAO_HAS_SYNC_SCOPE_POLICY in the switch-case block. + + * tao/Messaging_ORBInitializer.cpp: + Save the pointers to hooks for + TAO_RelativeRoundtripTimeout and TAO_Sync_Scope + policies in the + TAO_Messaging_ORBInitializer::pre_init by calling the + TAO_ORB_Core::set_timeout_hook and + TAO_ORB_Core::set_sync_scope_hook. + + * tao/UIOP_Connect.h: + * tao/UIOP_Connect.cpp: + + * tao/SHMIOP_Connect.h: + * tao/SHMIOP_Connect.cpp (handle_timeout): + + * tao/IIOP_Connect.h: + * tao/IIOP_Connect.cpp (handle_timeout): + Set the timeout value by calling TAO_ORB_Core::call_timeout_hook + instead of getting a TAO_RelativeRoundtripPolicy pointer and + proceeding from there. + + * tao/Invocation.h: + * tao/Invocation.cpp: + Same as IIOP_Connect for TAO_RelativeRoundtripTimeoutPolicy. + Similar change with sync_scope. Instead of getting a + TAO_Sync_Scope_Policy_ptr and gettting the sync_scope + value, call the hook for the sync_scope which is + TAO_ORB_Core::call_sync_scope_hook. + + * tao/ClientRequestInfo.h : + * tao/ClientRequestInfo.cpp (sync_scope): + Modified the return value of sync_scope from + Messaging::SyncScope to CORBA::Short. + Mon Oct 30 18:57:22 2000 Irfan Pyarali <irfan@cs.wustl.edu> * tao/PortableServer/POA: Removed the Forwarding Servant. The diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 00597f7c98d..0a7e2557332 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -135,7 +135,6 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, { // protocol_factories is in the following form // IOP1://addr1,addr2,...,addrN/;IOP2://addr1,...addrM/;... - TAO_EndpointSet endpoint_set = orb_core->orb_params ()->endpoints (); TAO_EndpointSetIterator endpoints = endpoint_set.begin (); @@ -210,7 +209,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, int found = 0; // If usable protocol (factory) is found then this will be // set equal to 1. - + for (TAO_ProtocolFactorySetItor factory = orb_core->protocol_factories ()->begin (); factory != end; @@ -252,7 +251,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, -1); } } - + // No longer need the endpoint set since all associated acceptors // have been opened by now. Reclaim the memory used by the endpoint // set. diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp index 55884e50808..d67175ea857 100644 --- a/TAO/tao/ClientRequestInfo.cpp +++ b/TAO/tao/ClientRequestInfo.cpp @@ -163,7 +163,7 @@ TAO_ClientRequestInfo::response_expected (CORBA::Environment &) } # if (TAO_HAS_CORBA_MESSAGING == 1) -Messaging::SyncScope +CORBA::Short TAO_ClientRequestInfo::sync_scope (CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h index a7978c1e625..806dd300dcc 100644 --- a/TAO/tao/ClientRequestInfo.h +++ b/TAO/tao/ClientRequestInfo.h @@ -88,7 +88,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)) ; # if (TAO_HAS_CORBA_MESSAGING == 1) - virtual Messaging::SyncScope sync_scope ( + virtual CORBA::Short sync_scope ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_CORBA_MESSAGING */ diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile index 20b27b1eda2..0cf76c3a037 100644 --- a/TAO/tao/DynamicAny/Makefile +++ b/TAO/tao/DynamicAny/Makefile @@ -62,8 +62,7 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/DynamicAny.o .obj/DynamicAny.so .shobj/DynamicAny.o .shobj/DynamicAny.so: DynamicAny.cpp DynamicAny.h \ - $(ACE_ROOT)/ace/pre.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -179,8 +178,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -382,8 +380,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 \ @@ -499,8 +497,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -706,8 +703,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 \ @@ -823,8 +820,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -1026,8 +1022,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 \ @@ -1143,8 +1139,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -1370,8 +1365,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 \ @@ -1465,8 +1460,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -1670,8 +1664,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 \ @@ -1787,8 +1781,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -1990,8 +1983,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 \ @@ -2107,8 +2100,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -2312,8 +2304,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 \ @@ -2429,8 +2421,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -2634,8 +2625,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Marshal.i .obj/DynamicAnyC.o .obj/DynamicAnyC.so .shobj/DynamicAnyC.o .shobj/DynamicAnyC.so: DynamicAnyC.cpp DynamicAny.h \ - $(ACE_ROOT)/ace/pre.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2751,8 +2741,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - DynamicAnyC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DynamicAnyC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp index 596d95c4df3..31f4a24210a 100644 --- a/TAO/tao/IIOP_Connect.cpp +++ b/TAO/tao/IIOP_Connect.cpp @@ -493,27 +493,11 @@ TAO_IIOP_Client_Connection_Handler::handle_timeout (const ACE_Time_Value &, ACE_Time_Value *max_wait_time = 0; -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - - TAO_RelativeRoundtripTimeoutPolicy *timeout_policy = - this->orb_core_->stubless_relative_roundtrip_timeout (); - - // Automatically release the policy - CORBA::Object_var auto_release = timeout_policy; - - ACE_Time_Value max_wait_time_value; - - // If max_wait_time is not zero then this is not the first attempt - // to send the request, the timeout value includes *all* those - // attempts. - if (timeout_policy != 0) - { - timeout_policy->set_time_value (max_wait_time_value); - max_wait_time = &max_wait_time_value; - } - - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ + TAO_Stub *stub = 0; + int has_timeout; + this->orb_core_->call_timeout_hook (stub, + has_timeout, + *max_wait_time); // Cannot deal with errors, and therefore they are ignored. this->transport ()->send_buffered_messages (max_wait_time); diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 4d14069e21a..e4e96e2716f 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -424,16 +424,21 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core) new_connector_lock.release (); #if defined (TAO_USES_ROBUST_CONNECTION_MGMT) + return this->base_connector_.open (this->orb_core_->reactor (), &this->null_creation_strategy_, this->cached_connect_strategy_, &this->null_activation_strategy_); + #else /* TAO_USES_ROBUST_CONNECTION_MGMT */ + return this->base_connector_.open (this->orb_core_->reactor (), &this->null_creation_strategy_, cached_connect_strategy, &this->null_activation_strategy_); + #endif /* TAO_USES_ROBUST_CONNECTION_MGMT */ + } int @@ -772,6 +777,7 @@ TAO_IIOP_Connector::object_key_delimiter (void) const int TAO_IIOP_Connector::init_tcp_properties (void) { + #if (TAO_HAS_RT_CORBA == 1) // Connector protocol properties are obtained from ORB-level @@ -783,7 +789,7 @@ TAO_IIOP_Connector::init_tcp_properties (void) // overrides for protocol configuration because connection // lookup and caching are not done based on protocol // properties. - + ACE_DECLARE_NEW_CORBA_ENV; // Check ORB-level override for tcp properties. @@ -793,10 +799,10 @@ TAO_IIOP_Connector::init_tcp_properties (void) RTCORBA::TCPProtocolProperties_var tcp_properties = RTCORBA::TCPProtocolProperties::_nil (); - if (client_protocols != 0) + if (client_protocols != 0) { RTCORBA::ProtocolList & protocols = client_protocols->protocols_rep (); - + for (CORBA::ULong j = 0; j < protocols.length (); ++j) if (protocols[j].protocol_type == TAO_TAG_IIOP_PROFILE) { diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile index f0c2841627d..57adf4a9dfc 100644 --- a/TAO/tao/IORManipulation/Makefile +++ b/TAO/tao/IORManipulation/Makefile @@ -56,8 +56,7 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IORC.o .obj/IORC.so .shobj/IORC.o .shobj/IORC.so: IORC.cpp IORManip_Loader.h \ - $(ACE_ROOT)/ace/pre.h \ - ior_manip_export.h \ + $(ACE_ROOT)/ace/pre.h ior_manip_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -173,8 +172,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - IORC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h IORC.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Object.h \ @@ -194,8 +192,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 \ @@ -213,8 +210,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB.i .obj/IORManip_Loader.o .obj/IORManip_Loader.so .shobj/IORManip_Loader.o .shobj/IORManip_Loader.so: IORManip_Loader.cpp IORManip_Loader.h \ - $(ACE_ROOT)/ace/pre.h \ - ior_manip_export.h \ + $(ACE_ROOT)/ace/pre.h ior_manip_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -330,8 +326,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - IORC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h IORC.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Object.h \ @@ -351,8 +346,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 @@ -481,8 +476,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - IORC.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h IORC.h \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Environment.h \ @@ -497,8 +491,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 e4c4cf07663..87a9a828a2e 100644 --- a/TAO/tao/IORTable/Makefile +++ b/TAO/tao/IORTable/Makefile @@ -54,8 +54,7 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/IORTable.o .obj/IORTable.so .shobj/IORTable.o .shobj/IORTable.so: IORTable.cpp IORTable.h \ - $(ACE_ROOT)/ace/pre.h \ - iortable_export.h \ + $(ACE_ROOT)/ace/pre.h iortable_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -148,8 +147,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - IORTableC.h \ + $(TAO_ROOT)/tao/corbafwd.i IORTableC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ @@ -688,8 +686,7 @@ CPPFLAGS += -I$(TAO_ROOT) iortable_export.h IORTableC.i .obj/Table_Adapter.o .obj/Table_Adapter.so .shobj/Table_Adapter.o .shobj/Table_Adapter.so: Table_Adapter.cpp Table_Adapter.h \ - $(ACE_ROOT)/ace/pre.h \ - iortable_export.h \ + $(ACE_ROOT)/ace/pre.h iortable_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1006,8 +1003,7 @@ 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 \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1100,8 +1096,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - IORTableC.h \ + $(TAO_ROOT)/tao/corbafwd.i IORTableC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/Environment.h \ $(TAO_ROOT)/tao/Environment.i \ diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index 008b3dc2f14..a4e84bc60b1 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -163,26 +163,16 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV) this->is_selector_initialized_ = 1; } -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - - TAO_RelativeRoundtripTimeoutPolicy *timeout_policy = - this->stub_->relative_roundtrip_timeout (); - - // Automatically release the policy - CORBA::Object_var auto_release = timeout_policy; - - // If max_wait_time is not zero then this is not the first attempt - // to send the request, the timeout value includes *all* those - // attempts. - if (this->max_wait_time_ == 0 - && timeout_policy != 0) + if (this->max_wait_time_ == 0) { - timeout_policy->set_time_value (this->max_wait_time_value_); - this->max_wait_time_ = &this->max_wait_time_value_; + int has_timeout; + this->orb_core_->call_timeout_hook (this->stub_, + has_timeout, + this->max_wait_time_value_); + if (has_timeout) + this->max_wait_time_ = &this->max_wait_time_value_; } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - ACE_Countdown_Time countdown (this->max_wait_time_); // Loop until a connection is established or there aren't any more @@ -971,19 +961,13 @@ TAO_GIOP_Oneway_Invocation (TAO_Stub *stub, : TAO_GIOP_Invocation (stub, operation, opname_len, orb_core), sync_scope_ (TAO::SYNC_WITH_TRANSPORT) { -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - - TAO_Sync_Scope_Policy *ssp = stub->sync_scope (); - - // Automatically release the policy - CORBA::Object_var auto_release = ssp; - - if (ssp) - { - ssp->get_synchronization (this->sync_scope_); - } - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ + int has_synchronization = 0; + int scope = 0; + this->orb_core_->call_sync_scope_hook (this->stub_, + has_synchronization, + scope); + + this->sync_scope_ = scope; } TAO_GIOP_Oneway_Invocation::~TAO_GIOP_Oneway_Invocation (void) diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 41e5ef1b7d5..65562d69e64 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -1971,8 +1971,7 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i \ - iiop_endpoints.i + Any.i iiop_endpoints.i .obj/IIOP_Factory.o .obj/IIOP_Factory.so .shobj/IIOP_Factory.o .shobj/IIOP_Factory.so: IIOP_Factory.cpp \ IIOP_Factory.h \ @@ -4568,8 +4567,7 @@ realclean: $(ACE_ROOT)/ace/SString.i \ Exception.i \ Typecode.i \ - Any.i \ - uiop_endpoints.i + Any.i uiop_endpoints.i .obj/UIOP_Factory.o .obj/UIOP_Factory.so .shobj/UIOP_Factory.o .shobj/UIOP_Factory.so: UIOP_Factory.cpp \ UIOP_Factory.h \ @@ -10704,8 +10702,7 @@ realclean: ORB.i \ Marshal.i -.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp \ - Marshal.h \ +.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp Marshal.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -10973,8 +10970,7 @@ realclean: PolicyC.i \ ORB.i -.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp \ - Any.h \ +.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp Any.h \ $(ACE_ROOT)/ace/pre.h \ CDR.h \ corbafwd.h \ @@ -12592,8 +12588,7 @@ realclean: Any.h \ Any.i -.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp \ - ORB.h \ +.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp ORB.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -12920,8 +12915,7 @@ realclean: Messaging_ORBInitializer.h \ ValueFactory_Map.h \ ValueFactory_Map.i \ - Object_KeyC.h \ - Object_KeyC.i + Object_KeyC.h Object_KeyC.i .obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp \ corbafwd.h \ @@ -14104,8 +14098,7 @@ realclean: PortableServer/portableserver_export.h .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 \ @@ -14197,8 +14190,7 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - PolicyC.h \ + corbafwd.i PolicyC.h \ CurrentC.h \ Object.h \ corbafwd.h \ @@ -14251,9 +14243,8 @@ realclean: LocalObject.h \ LocalObject.i \ StringSeqC.h \ - StringSeqC.i \ - DomainC.i Stub.h \ - Pluggable.h \ + StringSeqC.i DomainC.i \ + Stub.h Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -14361,8 +14352,7 @@ realclean: Interceptor_List.h \ Interceptor_List.inl \ ORB_Core.i \ - Stub.i \ - Invocation.h \ + Stub.i Invocation.h \ Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ @@ -14383,9 +14373,8 @@ realclean: operation_details.i \ Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ - Invocation.i \ - Exception.h InterfaceC.h \ - ifrfwd.h \ + Invocation.i Exception.h \ + InterfaceC.h ifrfwd.h \ ORB_Core.h PortableInterceptor.h \ PortableInterceptor.i @@ -15047,8 +15036,7 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i -.obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp \ - Endpoint.h \ +.obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp Endpoint.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -16018,8 +16006,7 @@ realclean: PolicyC.i \ ORB.i -.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp \ - Timeprobe.h \ +.obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp Timeprobe.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -16303,8 +16290,7 @@ realclean: $(ACE_ROOT)/ace/Service_Object.i \ TAO_Export.h -.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp \ - debug.h \ +.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp debug.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -18105,8 +18091,7 @@ realclean: StringSeqC.i .obj/PortableInterceptorC.o .obj/PortableInterceptorC.so .shobj/PortableInterceptorC.o .shobj/PortableInterceptorC.so: PortableInterceptorC.cpp \ - PortableInterceptorC.h \ - $(ACE_ROOT)/ace/pre.h \ + PortableInterceptorC.h $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -18199,8 +18184,7 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - DynamicC.h \ + corbafwd.i DynamicC.h \ Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -18226,9 +18210,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - DynamicC.i MessagingC.h \ - ValueBase.h \ + Sequence_T.cpp DynamicC.i \ + MessagingC.h ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ @@ -18242,8 +18225,8 @@ realclean: IOPC.h \ IOPC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i \ + PollableC.i MessagingC.i \ + CurrentC.h IOPC.h PortableInterceptorC.i \ CORBA_String.h \ CORBA_String.inl @@ -18367,8 +18350,7 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - DynamicC.i \ + Sequence_T.cpp DynamicC.i \ StringSeqC.h \ StringSeqC.i @@ -18473,8 +18455,7 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - OctetSeqC.i \ + Sequence_T.cpp OctetSeqC.i \ Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -18596,8 +18577,7 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - StringSeqC.i \ + Sequence_T.cpp StringSeqC.i \ Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -23725,8 +23705,7 @@ realclean: Request.i \ debug.h -.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h $(ACE_ROOT)/ace/pre.h \ TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -23830,8 +23809,7 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - IOPC.i \ + Sequence_T.cpp IOPC.i \ Any.h \ Environment.h \ Environment.i \ @@ -23848,9 +23826,8 @@ realclean: Typecode.i \ 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 \ - TAO_Export.h \ +.obj/IOPS.o .obj/IOPS.so .shobj/IOPS.o .shobj/IOPS.so: IOPS.cpp IOPS.h $(ACE_ROOT)/ace/pre.h \ + IOPC.h TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -23953,8 +23930,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - IOPC.i IOPS_T.h IOPS_T.i IOPS_T.cpp IOPS.i + Sequence_T.cpp IOPC.i \ + IOPS_T.h IOPS_T.i IOPS_T.cpp IOPS.i .obj/PollableC.o .obj/PollableC.so .shobj/PollableC.o .shobj/PollableC.so: PollableC.cpp PollableC.h \ $(ACE_ROOT)/ace/pre.h \ @@ -24063,8 +24040,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 \ @@ -24340,8 +24316,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 \ @@ -24832,8 +24808,7 @@ realclean: Interceptor_List.inl \ ORB_Core.i -.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp \ - GIOPC.h \ +.obj/GIOPC.o .obj/GIOPC.so .shobj/GIOPC.o .shobj/GIOPC.so: GIOPC.cpp GIOPC.h \ $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -25069,12 +25044,10 @@ realclean: Sequence_T.cpp \ IOPC.i \ Object_KeyC.h \ - Object_KeyC.i \ - GIOPC.i \ + Object_KeyC.i GIOPC.i \ GIOPS_T.h \ GIOPS_T.i \ - GIOPS_T.cpp \ - GIOPS.i + GIOPS_T.cpp GIOPS.i .obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp \ BoundsC.h \ @@ -25193,8 +25166,7 @@ realclean: Any.i \ BoundsC.i -.obj/TAOC.o .obj/TAOC.so .shobj/TAOC.o .shobj/TAOC.so: TAOC.cpp TAOC.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/TAOC.o .obj/TAOC.so .shobj/TAOC.o .shobj/TAOC.so: TAOC.cpp TAOC.h $(ACE_ROOT)/ace/pre.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -25331,8 +25303,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 \ @@ -25432,8 +25403,8 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i \ - TAOS_T.h TAOS_T.i TAOS_T.cpp TAOS.i + corbafwd.i TAOS_T.h \ + TAOS_T.i TAOS_T.cpp TAOS.i .obj/Object_Loader.o .obj/Object_Loader.so .shobj/Object_Loader.o .shobj/Object_Loader.so: Object_Loader.cpp Object_Loader.h \ $(ACE_ROOT)/ace/pre.h \ @@ -25668,8 +25639,7 @@ realclean: Typecode.h \ Typecode.i -.obj/DLL_ORB.o .obj/DLL_ORB.so .shobj/DLL_ORB.o .shobj/DLL_ORB.so: DLL_ORB.cpp \ - $(ACE_ROOT)/ace/ARGV.h \ +.obj/DLL_ORB.o .obj/DLL_ORB.so .shobj/DLL_ORB.o .shobj/DLL_ORB.so: DLL_ORB.cpp $(ACE_ROOT)/ace/ARGV.h \ $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -26859,8 +26829,8 @@ realclean: $(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 \ - DLL_Parser.i Object_Loader.h Object_Loader.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h DLL_Parser.i \ + Object_Loader.h Object_Loader.i \ Object.h \ Abstract_Servant_Base.h \ Object_Proxy_Broker.h \ @@ -26994,8 +26964,7 @@ realclean: $(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 \ - FILE_Parser.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h FILE_Parser.i \ Object_Loader.h \ Object_Loader.i \ Object.h \ @@ -28397,8 +28366,7 @@ realclean: ORB_Core.i .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 \ + ORBInitializer_Registry.h $(ACE_ROOT)/ace/pre.h \ TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -28492,8 +28460,7 @@ realclean: orbconf.h \ $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ - corbafwd.i \ - DynamicC.h \ + corbafwd.i DynamicC.h \ Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -28519,9 +28486,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - DynamicC.i MessagingC.h \ - ValueBase.h \ + Sequence_T.cpp DynamicC.i \ + MessagingC.h ValueBase.h \ ValueBase.i \ ValueFactory.h \ ValueFactory.i \ @@ -28535,8 +28501,8 @@ realclean: IOPC.h \ IOPC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i \ + PollableC.i MessagingC.i \ + CurrentC.h IOPC.h PortableInterceptorC.i \ TAO_Singleton.h \ TAO_Singleton.inl \ TAO_Singleton.cpp \ @@ -28548,8 +28514,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 \ @@ -29759,8 +29724,7 @@ realclean: IOPC.h \ IOPC.i \ PollableC.h \ - PollableC.i \ - MessagingC.i \ + PollableC.i MessagingC.i \ Stub.h \ Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -30313,6 +30277,120 @@ realclean: LocalObject.h \ LocalObject.i \ Messaging_Policy_i.i \ + Stub.h \ + Pluggable.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/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 \ + Pluggable.i \ + MProfile.h \ + Profile.h \ + Tagged_Components.h \ + CONV_FRAMEC.h \ + CONV_FRAMEC.i \ + Tagged_Components.i \ + GIOP_Message_State.h \ + Pluggable_Messaging.h \ + Pluggable_Messaging_Utils.h \ + Pluggable_Messaging_Utils.i \ + Pluggable_Messaging.i \ + GIOP_Message_State.i \ + Profile.i \ + MProfile.i \ + ORB.h \ + Services.h \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + ORB.i \ + ORB_Core.h \ + Policy_Manager.h \ + Policy_Manager.i \ + Resource_Factory.h \ + Protocol_Factory.h \ + params.h \ + params.i \ + TAO_Singleton_Manager.h \ + TAO_Singleton_Manager.inl \ + TAO_Singleton.h \ + TAO_Singleton.inl \ + TAO_Singleton.cpp \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + PortableInterceptorC.h \ + DynamicC.h \ + DynamicC.i \ + PortableInterceptorC.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Interceptor_List.h \ + Interceptor_List.inl \ + ORB_Core.i \ + Stub.i \ debug.h .obj/Client_Priority_Policy.o .obj/Client_Priority_Policy.so .shobj/Client_Priority_Policy.o .shobj/Client_Priority_Policy.so: Client_Priority_Policy.cpp \ @@ -30790,7 +30868,103 @@ realclean: PortableInterceptorC.i \ LocalObject.h \ LocalObject.i \ - Messaging_PolicyFactory.h + Messaging_PolicyFactory.h \ + Messaging_Policy_i.h \ + Messaging_Policy_i.i \ + ORB_Core.h \ + ORB.h \ + Services.h \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + ORB.i \ + 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 \ + Pluggable.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/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 \ + $(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 \ + 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 \ + Adapter.h \ + Adapter.i \ + PolicyFactory_Registry.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + Parser_Registry.h \ + Parser_Registry.i \ + Service_Callbacks.h \ + Service_Callbacks.i \ + Fault_Tolerance_Service.h \ + Fault_Tolerance_Service.i \ + Interceptor_List.h \ + Interceptor_List.inl \ + ORB_Core.i .obj/Priority_Mapping.o .obj/Priority_Mapping.so .shobj/Priority_Mapping.o .shobj/Priority_Mapping.so: Priority_Mapping.cpp \ orbconf.h \ @@ -32367,8 +32541,7 @@ realclean: $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i \ - corbafwd.h \ + $(ACE_ROOT)/ace/OS.i corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -32438,8 +32611,7 @@ 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 \ @@ -32451,8 +32623,7 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - IOPC.i \ + Sequence_T.cpp IOPC.i \ PolicyC.h \ CurrentC.h \ Object.h \ @@ -32470,12 +32641,10 @@ realclean: Typecode.i \ Environment.h \ Environment.i \ - PolicyC.i \ - TimeBaseC.h \ + PolicyC.i TimeBaseC.h \ Any.h \ Any.i \ - TimeBaseC.i \ - RTCORBAC.i \ + TimeBaseC.i RTCORBAC.i \ TAOS.h \ TAOS_T.h \ TAOS_T.i \ @@ -32505,9 +32674,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 \ - TAO_Export.h \ + $(ACE_ROOT)/ace/OS.i RTCORBAS.h orbconf.h \ + IOPS.h IOPC.h TAO_Export.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -32588,8 +32756,8 @@ realclean: Sequence.i \ Sequence_T.h \ Sequence_T.i \ - Sequence_T.cpp \ - IOPC.i IOPS_T.h IOPS_T.i IOPS_T.cpp IOPS.i TimeBaseS.h \ + Sequence_T.cpp IOPC.i \ + IOPS_T.h IOPS_T.i IOPS_T.cpp IOPS.i TimeBaseS.h \ TimeBaseC.h \ Any.h \ Environment.h \ @@ -32610,15 +32778,13 @@ realclean: TimeBaseS_T.h \ TimeBaseS_T.i \ TimeBaseS_T.cpp \ - TimeBaseS.i \ - RTCORBAC.h corbafwd.h \ - PolicyC.h \ + TimeBaseS.i RTCORBAC.h \ + corbafwd.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 + PolicyC.i TimeBaseC.h \ + RTCORBAC.i RTCORBAS_T.h RTCORBAS_T.i RTCORBAS_T.cpp RTCORBAS.i .obj/RT_PolicyFactory.o .obj/RT_PolicyFactory.so .shobj/RT_PolicyFactory.o .shobj/RT_PolicyFactory.so: RT_PolicyFactory.cpp \ RT_PolicyFactory.h \ diff --git a/TAO/tao/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging_ORBInitializer.cpp index db4c9a9b8ab..11f2ff1b87d 100644 --- a/TAO/tao/Messaging_ORBInitializer.cpp +++ b/TAO/tao/Messaging_ORBInitializer.cpp @@ -9,6 +9,8 @@ ACE_RCSID (tao, Messaging_ORBInitializer, "$Id$") #if TAO_HAS_CORBA_MESSAGING == 1 #include "tao/Messaging_PolicyFactory.h" +#include "tao/Messaging_Policy_i.h" +#include "tao/ORB_Core.h" void TAO_Messaging_ORBInitializer::pre_init ( @@ -16,6 +18,12 @@ TAO_Messaging_ORBInitializer::pre_init ( TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { + TAO_ORB_Core::set_timeout_hook + (TAO_RelativeRoundtripTimeoutPolicy::hook); + + TAO_ORB_Core::set_sync_scope_hook + (TAO_Sync_Scope_Policy::hook); + } void @@ -35,7 +43,6 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( TAO_ENV_ARG_DECL) { /// Register the Messaging policy factories. - PortableInterceptor::PolicyFactory_ptr temp_factory = PortableInterceptor::PolicyFactory::_nil (); PortableInterceptor::PolicyFactory_var policy_factory; @@ -53,23 +60,19 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( ACE_CHECK; policy_factory = temp_factory; - + /// Bind the same policy factory to all Messaging related policy /// types since a single policy factory is used to create each of /// the different types of Messaging policies. CORBA::PolicyType type; - -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - + type = TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - + #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) type = TAO_CLIENT_PRIORITY_POLICY_TYPE; @@ -80,16 +83,12 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - type = TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) type = TAO_BUFFERING_CONSTRAINT_POLICY_TYPE; @@ -99,76 +98,76 @@ TAO_Messaging_ORBInitializer::register_policy_factories ( ACE_CHECK; #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ - + type = TAO_MESSAGING_REBIND_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; + type = TAO_MESSAGING_REQUEST_PRIORITY_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - + type = TAO_MESSAGING_REPLY_PRIORITY_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - + type = TAO_MESSAGING_REQUEST_START_TIME_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - + type = TAO_MESSAGING_REQUEST_END_TIME_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - + type = TAO_MESSAGING_REPLY_START_TIME_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - + type = TAO_MESSAGING_REPLY_END_TIME_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - + type = TAO_MESSAGING_RELATIVE_REQ_TIMEOUT_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - + type = TAO_MESSAGING_ROUTING_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - + type = TAO_MESSAGING_MAX_HOPS_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - + type = TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE; info->register_policy_factory (type, policy_factory.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; - + /// Transfer ownership of the policy factory to the registry. (void) policy_factory._retn (); - } #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ diff --git a/TAO/tao/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging_PolicyFactory.cpp index 3f550afafed..89a29ccb016 100644 --- a/TAO/tao/Messaging_PolicyFactory.cpp +++ b/TAO/tao/Messaging_PolicyFactory.cpp @@ -26,15 +26,11 @@ TAO_Messaging_PolicyFactory::create_policy ( switch (type) { -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE: return TAO_RelativeRoundtripTimeoutPolicy::create ( value TAO_ENV_ARG_PARAMETER); -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) case TAO_CLIENT_PRIORITY_POLICY_TYPE: @@ -43,14 +39,10 @@ TAO_Messaging_PolicyFactory::create_policy ( #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE: return TAO_Sync_Scope_Policy::create (value TAO_ENV_ARG_PARAMETER); -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) case TAO_BUFFERING_CONSTRAINT_POLICY_TYPE: diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp index 532eebe1b0b..f63c8fb60eb 100644 --- a/TAO/tao/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging_Policy_i.cpp @@ -1,6 +1,7 @@ // $Id$ #include "tao/Messaging_Policy_i.h" +#include "tao/Stub.h" #include "tao/debug.h" #if ! defined (__ACE_INLINE__) @@ -9,8 +10,6 @@ ACE_RCSID(TAO, Messaging_Policy_i, "$Id$") -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy (const TimeBase::TimeT& relative_expiry) : relative_expiry_ (relative_expiry) { @@ -39,6 +38,57 @@ TAO_RelativeRoundtripTimeoutPolicy::policy_type (CORBA_Environment &) return TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE; } +void +TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, + TAO_Stub *stub, + int &has_timeout, + ACE_Time_Value &time_value) +{ + CORBA::Policy_var policy = 0; + + if (stub == 0) + policy = orb_core->stubless_relative_roundtrip_timeout (); + else + policy = stub->relative_roundtrip_timeout (); + + if (CORBA::is_nil (policy.in ())) + { + has_timeout = 0; + return; + } + ACE_TRY_NEW_ENV + { + Messaging::RelativeRoundtripTimeoutPolicy_var p = + Messaging::RelativeRoundtripTimeoutPolicy::_narrow (policy.in (), + ACE_TRY_ENV); + ACE_TRY_CHECK; + + TimeBase::TimeT t = p->relative_expiry (ACE_TRY_ENV); + ACE_TRY_CHECK; + TimeBase::TimeT seconds = t / 10000000u; + TimeBase::TimeT microseconds = (t % 10000000u) / 10; + time_value.set (ACE_U64_TO_U32 (seconds), + ACE_U64_TO_U32 (microseconds)); + + // Set the flag once all operations complete successfully + has_timeout = 1; + + if (TAO_debug_level > 0) + { + CORBA::ULong msecs = + ACE_static_cast(CORBA::ULong, microseconds / 1000); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"), + msecs)); + } + } + ACE_CATCH (CORBA::Exception, ex) + { + // Ignore all exceptions... + } + ACE_ENDTRY; +} + CORBA::Policy_ptr TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV) @@ -112,8 +162,6 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) } } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - // **************************************************************** #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) @@ -137,6 +185,48 @@ TAO_Sync_Scope_Policy::policy_type (CORBA_Environment &) return Messaging::SYNC_SCOPE_POLICY_TYPE; } +void +TAO_Sync_Scope_Policy::hook (TAO_ORB_Core *orb_core, + TAO_Stub *stub, + int &has_synchronization, + int &scope) +{ + CORBA::Policy_var policy = 0; + + if (stub == 0) + orb_core->stubless_sync_scope (policy); + else + policy = stub->sync_scope (); + + if (CORBA::is_nil (policy.in ())) + { + has_synchronization = 0; + return; + } + + ACE_TRY_NEW_ENV + { + Messaging::SyncScopePolicy_var p = + Messaging::SyncScopePolicy::_narrow (policy.in ()); + ACE_TRY_CHECK; + + if (CORBA::is_nil (p.in ())) + ACE_THROW (CORBA::INTERNAL ( + CORBA_SystemException::_tao_minor_code ( + TAO_POLICY_NARROW_CODE, + 0), + CORBA::COMPLETED_NO)); + + has_synchronization = 1; + scope = p->synchronization (); + } + ACE_CATCH (CORBA::Exception, ex) + { + // Ignore all exceptions... + } + ACE_ENDTRY; +} + CORBA::Policy_ptr TAO_Sync_Scope_Policy::create (const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV) diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h index bf01ae04b58..d0d4b1edd0e 100644 --- a/TAO/tao/Messaging_Policy_i.h +++ b/TAO/tao/Messaging_Policy_i.h @@ -32,8 +32,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - class TAO_Export TAO_RelativeRoundtripTimeoutPolicy : public Messaging::RelativeRoundtripTimeoutPolicy, public TAO_Local_RefCounted_Object @@ -52,6 +50,13 @@ public: TAO_RelativeRoundtripTimeoutPolicy (const TAO_RelativeRoundtripTimeoutPolicy &rhs); // Copy constructor. + /// Implement the timeout hook, this is set in the ORB_Core at + /// initialization time. + static void hook (TAO_ORB_Core *orb_core, + TAO_Stub *stub, + int &has_timeout, + ACE_Time_Value &time_value); + static CORBA::Policy_ptr create (const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); // Helper method for the implementation of @@ -81,12 +86,8 @@ private: // The attribute }; -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - //////////////////////////////////////////////////////////////////////////////// -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - class TAO_Export TAO_Sync_Scope_Policy : public Messaging::SyncScopePolicy, public TAO_Local_RefCounted_Object @@ -105,6 +106,13 @@ public: TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs); // Copy constructor. + /// Implement the Sync_Scope hook, this is set in the ORB_Core at + /// initialization time. + static void hook (TAO_ORB_Core *orb_core, + TAO_Stub *stub, + int &has_synchronization, + int &scope); + static CORBA::Policy_ptr create (const CORBA::Any& val, CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()); // Helper method for the implementation of @@ -143,7 +151,5 @@ private: #pragma warning(pop) #endif /* _MSC_VER */ -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #include "ace/post.h" #endif /* TAO_MESSAGING_POLICY_I_H */ diff --git a/TAO/tao/Messaging_Policy_i.i b/TAO/tao/Messaging_Policy_i.i index 2915eaae01e..799d8d51dfa 100644 --- a/TAO/tao/Messaging_Policy_i.i +++ b/TAO/tao/Messaging_Policy_i.i @@ -1,11 +1,7 @@ // $Id$ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - ACE_INLINE void TAO_Sync_Scope_Policy::get_synchronization (Messaging::SyncScope &s) const { s = this->synchronization_; } - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index fb467e0d8ed..a680f259b81 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -32,7 +32,7 @@ #include "tao/RT_Current.h" # include "tao/ORBInitInfo.h" -# include "tao/ORBInitializer_Registry.h" +# include "tao/ORBInitializer_Registry.h" #if TAO_HAS_RT_CORBA == 1 # include "tao/RT_ORBInitializer.h" // @@ This should go away! @@ -1188,7 +1188,7 @@ CORBA::ORB_init (int &argc, TAO_ORB_Core_Auto_Ptr safe_oc (oc); - // #if TAO_HAS_INTERCEPTORS == 1 + ///#if TAO_HAS_INTERCEPTORS == 1 // ------------------------------------------------------------- // @@ These ORB initializer instantiations should go away. They @@ -1221,7 +1221,7 @@ CORBA::ORB_init (int &argc, (void) orb_initializer._retn (); #endif /* TAO_HAS_RT_CORBA == 1 */ -#if TAO_HAS_CORBA_MESSAGING == 1 + #if TAO_HAS_CORBA_MESSAGING == 1 /// Register the Messaging ORBInitializer. ACE_NEW_THROW_EX (temp_orb_initializer, TAO_Messaging_ORBInitializer, @@ -1239,7 +1239,7 @@ CORBA::ORB_init (int &argc, /// Transfer ownership to the ORBInitializer registry. (void) orb_initializer._retn (); -#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ + #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ // ------------------------------------------------------------- PortableInterceptor::ORBInitInfo_ptr orb_init_info_temp; @@ -1267,7 +1267,7 @@ CORBA::ORB_init (int &argc, TAO_ORBInitializer_Registry::instance ()->pre_init (orb_init_info.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::ORB::_nil ()); - // #endif /* TAO_HAS_INTERCEPTORS == 1 */ + ///#endif /* TAO_HAS_INTERCEPTORS == 1 */ // Initialize the ORB Core instance. int result = safe_oc->init (argc, argv, ACE_TRY_ENV); @@ -1282,13 +1282,13 @@ CORBA::ORB_init (int &argc, CORBA::COMPLETED_NO), CORBA::ORB::_nil ()); - // #if TAO_HAS_INTERCEPTORS == 1 + /// #if TAO_HAS_INTERCEPTORS == 1 /// Call the ORBInitializer::post_init() on each registered ORB /// initializer. TAO_ORBInitializer_Registry::instance ()->post_init (orb_init_info.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::ORB::_nil ()); - // #endif /* TAO_HAS_INTERCEPTORS == 1 */ + /// #endif /* TAO_HAS_INTERCEPTORS == 1 */ if (TAO_debug_level >= 3) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp index c4dd59b1da8..8a675c90b5d 100644 --- a/TAO/tao/ORBInitializer_Registry.cpp +++ b/TAO/tao/ORBInitializer_Registry.cpp @@ -116,7 +116,6 @@ TAO_ORBInitializer_Registry::post_init ( } } - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Singleton<TAO_ORBInitializer_Registry, ACE_SYNCH_MUTEX>; diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 47338153ced..6d7f64537a4 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -61,6 +61,9 @@ TAO_default_environment () // **************************************************************** +TAO_ORB_Core::Timeout_Hook TAO_ORB_Core::timeout_hook_ = 0; +TAO_ORB_Core::Sync_Scope_Hook TAO_ORB_Core::sync_scope_hook_ = 0; + TAO_ORB_Core::TAO_ORB_Core (const char *orbid) : lock_ (), connector_registry_ (0), @@ -209,7 +212,6 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid) ACE_NEW (this->transport_sync_strategy_, TAO_Transport_Sync_Strategy); - // this->parser_registry_.open (this); } TAO_ORB_Core::~TAO_ORB_Core (void) @@ -1589,7 +1591,7 @@ TAO_ORB_Core::create_stub_object (const TAO_ObjectKey &key, CORBA::COMPLETED_NO ), 0); } - + // Make sure we have at least one profile. <mp> may end up being // empty if none of the acceptor endpoints have the right priority // for this object, for example. @@ -2500,14 +2502,97 @@ TAO_ORB_Core::implrepo_service (void) return CORBA::Object::_duplicate (this->implrepo_service_); } +void +TAO_ORB_Core::call_sync_scope_hook (TAO_Stub *stub, + int &has_synchronization, + int &scope) +{ + if (TAO_ORB_Core::sync_scope_hook_ == 0) + { + has_synchronization = 0; + return; + } + + (*TAO_ORB_Core::sync_scope_hook_) (this, stub, has_synchronization, scope); +} + +TAO_Sync_Strategy & +TAO_ORB_Core::get_sync_strategy (TAO_Stub *, + int &scope) +{ + if (scope == TAO::SYNC_WITH_TRANSPORT || + scope == TAO::SYNC_WITH_SERVER || + scope == TAO::SYNC_WITH_TARGET) + return this->transport_sync_strategy (); + + if (scope == TAO::SYNC_NONE || + scope == TAO::SYNC_EAGER_BUFFERING) + return this->eager_buffering_sync_strategy (); + + if (scope == TAO::SYNC_DELAYED_BUFFERING) + return this->delayed_buffering_sync_strategy (); + + return this->transport_sync_strategy (); +} + +void +TAO_ORB_Core::set_sync_scope_hook (Sync_Scope_Hook hook) +{ + TAO_ORB_Core::sync_scope_hook_ = hook; + return; +} + +void +TAO_ORB_Core::stubless_sync_scope (CORBA::Policy *&result) +{ + // No need to lock, the object is in TSS storage.... + TAO_Policy_Current &policy_current = + this->policy_current (); + result = policy_current.sync_scope (); + + // @@ Must lock, but is is harder to implement than just modifying + // this call: the ORB does take a lock to modify the policy + // manager + if (result == 0) + { + TAO_Policy_Manager *policy_manager = + this->policy_manager (); + if (policy_manager != 0) + result = policy_manager->sync_scope (); + } + + if (result == 0) + result = this->default_sync_scope (); + + return; +} + +void +TAO_ORB_Core::call_timeout_hook (TAO_Stub *stub, + int &has_timeout, + ACE_Time_Value &time_value) +{ + if (TAO_ORB_Core::timeout_hook_ == 0) + { + has_timeout = 0; + return; + } + (*TAO_ORB_Core::timeout_hook_) (this, stub, has_timeout, time_value); +} +void +TAO_ORB_Core::set_timeout_hook (Timeout_Hook hook) +{ + TAO_ORB_Core::timeout_hook_ = hook; + // Saving the hook pointer so that we can use it later when needed. -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) + return; +} -TAO_RelativeRoundtripTimeoutPolicy * +CORBA::Policy * TAO_ORB_Core::stubless_relative_roundtrip_timeout (void) { - TAO_RelativeRoundtripTimeoutPolicy *result = 0; + CORBA::Policy *result = 0; // No need to lock, the object is in TSS storage.... TAO_Policy_Current &policy_current = @@ -2531,8 +2616,6 @@ TAO_ORB_Core::stubless_relative_roundtrip_timeout (void) return result; } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_RT_CORBA == 1) TAO_ThreadpoolPolicy * diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index be337417a33..f241689c12b 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -83,6 +83,7 @@ class TAO_Delayed_Buffering_Sync_Strategy; #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ class TAO_Transport_Sync_Strategy; +class TAO_Sync_Strategy; // **************************************************************** @@ -405,16 +406,26 @@ public: #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) + CORBA::Policy *default_relative_roundtrip_timeout (void) const; - TAO_RelativeRoundtripTimeoutPolicy *default_relative_roundtrip_timeout (void) const; - - TAO_RelativeRoundtripTimeoutPolicy *stubless_relative_roundtrip_timeout (void); + CORBA::Policy *stubless_relative_roundtrip_timeout (void); // Access to the RoundtripTimeoutPolicy policy set on the thread or // on the ORB. In this method, we do not consider the stub since we // do not have access to it. -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ + void call_timeout_hook (TAO_Stub *stub, + int &has_timeout, + ACE_Time_Value &time_value); + + typedef void (*Timeout_Hook) (TAO_ORB_Core *, + TAO_Stub *, + int&, + ACE_Time_Value&); + + static void set_timeout_hook (Timeout_Hook hook); + + static Timeout_Hook timeout_hook_; + // The hook to be set for the RelativeRoundtripTimeoutPolicy #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) @@ -422,11 +433,23 @@ public: #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) + CORBA::Policy *default_sync_scope (void) const; + + void call_sync_scope_hook (TAO_Stub *stub, + int &has_synchronization, + int &scope); - TAO_Sync_Scope_Policy *default_sync_scope (void) const; + TAO_Sync_Strategy &get_sync_strategy (TAO_Stub *stub, + int &scope); -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ + typedef void (*Sync_Scope_Hook) (TAO_ORB_Core *, TAO_Stub *, int&, int&); + + static void set_sync_scope_hook (Sync_Scope_Hook hook); + + void stubless_sync_scope (CORBA::Policy *&result); + + static Sync_Scope_Hook sync_scope_hook_; + // The hook to be set for the SyncScopePolicy #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -821,7 +844,7 @@ protected: CORBA::ULong collocation_strategy_; // Default collocation policy. This should never be ORB_CONTROL. -#if (TAO_HAS_CORBA_MESSAGING == 1) + #if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Manager *policy_manager_; // The Policy_Manager for this ORB. @@ -832,7 +855,7 @@ protected: TAO_Policy_Current *policy_current_; // Policy current. -#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ + #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ CORBA::Object_var poa_current_; // POA current. diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 945cf75236a..cc013870add 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -309,16 +309,12 @@ TAO_ORB_Core::get_default_policy ( #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - -ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy * +ACE_INLINE CORBA::Policy * TAO_ORB_Core::default_relative_roundtrip_timeout (void) const { return this->default_policies_->relative_roundtrip_timeout (); } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) ACE_INLINE TAO_Client_Priority_Policy * @@ -329,16 +325,12 @@ TAO_ORB_Core::default_client_priority (void) const #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - -ACE_INLINE TAO_Sync_Scope_Policy * +ACE_INLINE CORBA::Policy * TAO_ORB_Core::default_sync_scope (void) const { return this->default_policies_->sync_scope (); } -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) ACE_INLINE TAO_Buffering_Constraint_Policy * diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index b4facfb0ef1..0d6e0c3f45b 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -43,12 +43,11 @@ TAO_Policy_Manager_Impl::copy_from (TAO_Policy_Manager_Impl *source, this->cleanup_i (ACE_TRY_ENV); ACE_CHECK; -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - if (source->relative_roundtrip_timeout_ != 0) { this->relative_roundtrip_timeout_ = - source->relative_roundtrip_timeout_->clone (); + source->relative_roundtrip_timeout_->copy (ACE_TRY_ENV); + ACE_CHECK; // Check that cloning succeeded. if (this->relative_roundtrip_timeout_ == 0) @@ -58,8 +57,6 @@ TAO_Policy_Manager_Impl::copy_from (TAO_Policy_Manager_Impl *source, this->count_++; } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) if (source->client_priority_ != 0) @@ -77,12 +74,11 @@ TAO_Policy_Manager_Impl::copy_from (TAO_Policy_Manager_Impl *source, #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - if (source->sync_scope_ != 0) { this->sync_scope_ = - source->sync_scope_->clone (); + source->sync_scope_->copy (ACE_TRY_ENV); + ACE_CHECK; // Check that cloning succeeded. if (this->sync_scope_ == 0) @@ -92,8 +88,6 @@ TAO_Policy_Manager_Impl::copy_from (TAO_Policy_Manager_Impl *source, this->count_++; } -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) if (source->buffering_constraint_ != 0) @@ -214,13 +208,9 @@ TAO_Policy_Manager_Impl::cleanup_i (CORBA::Environment &ACE_TRY_ENV) } this->other_policies_.length (0); -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - CORBA::release (this->relative_roundtrip_timeout_); this->relative_roundtrip_timeout_ = 0; -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) CORBA::release (this->client_priority_); @@ -228,13 +218,9 @@ TAO_Policy_Manager_Impl::cleanup_i (CORBA::Environment &ACE_TRY_ENV) #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - CORBA::release (this->sync_scope_); this->sync_scope_ = 0; -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) CORBA::release (this->buffering_constraint_); @@ -287,8 +273,8 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( for (CORBA::ULong i = 0; i < policies.length (); ++i) { - CORBA::Policy_ptr policy = policies[i]; - if (CORBA::is_nil (policy)) + CORBA::Policy_var policy = policies[i]; + if (CORBA::is_nil (policy.in ())) continue; CORBA::ULong slot = policy->policy_type (ACE_TRY_ENV); @@ -296,37 +282,22 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( switch (slot) { - -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE: { - Messaging::RelativeRoundtripTimeoutPolicy_var p = - Messaging::RelativeRoundtripTimeoutPolicy::_narrow (policy); - - if (CORBA::is_nil (p.in ())) - ACE_THROW (CORBA::INTERNAL ( - CORBA_SystemException::_tao_minor_code ( - TAO_POLICY_NARROW_CODE, - 0), - CORBA::COMPLETED_NO)); - - CORBA::release (this->relative_roundtrip_timeout_); - this->relative_roundtrip_timeout_ = - ACE_dynamic_cast (TAO_RelativeRoundtripTimeoutPolicy*, - p._retn ()); + this->relative_roundtrip_timeout_ = policy._retn (); + if (CORBA::is_nil (this->relative_roundtrip_timeout_)) + continue; + this->count_++; } break; -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) case TAO_CLIENT_PRIORITY_POLICY_TYPE: { TAO::ClientPriorityPolicy_var p = - TAO::ClientPriorityPolicy::_narrow (policy); + TAO::ClientPriorityPolicy::_narrow (policy.in ()); if (CORBA::is_nil (p.in ())) ACE_THROW (CORBA::INTERNAL ( @@ -346,37 +317,22 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE: { - Messaging::SyncScopePolicy_var p = - Messaging::SyncScopePolicy::_narrow (policy); - - if (CORBA::is_nil (p.in ())) - ACE_THROW (CORBA::INTERNAL ( - CORBA_SystemException::_tao_minor_code ( - TAO_POLICY_NARROW_CODE, - 0), - CORBA::COMPLETED_NO)); - - CORBA::release (this->sync_scope_); - this->sync_scope_ = - ACE_dynamic_cast (TAO_Sync_Scope_Policy*, - p._retn ()); - + this->sync_scope_ = policy._retn (); + if (CORBA::is_nil (this->sync_scope_)) + continue; + this->count_++; } break; -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) case TAO_BUFFERING_CONSTRAINT_POLICY_TYPE: { TAO::BufferingConstraintPolicy_var p = - TAO::BufferingConstraintPolicy::_narrow (policy); + TAO::BufferingConstraintPolicy::_narrow (policy.in ()); if (CORBA::is_nil (p.in ())) ACE_THROW (CORBA::INTERNAL ( @@ -401,7 +357,7 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_RT_PRIORITY_MODEL_POLICY_TYPE: { RTCORBA::PriorityModelPolicy_var p = - RTCORBA::PriorityModelPolicy::_narrow (policy); + RTCORBA::PriorityModelPolicy::_narrow (policy.in ()); if (CORBA::is_nil (p.in ())) ACE_THROW (CORBA::INTERNAL @@ -422,7 +378,7 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_RT_THREADPOOL_POLICY_TYPE: { RTCORBA::ThreadpoolPolicy_var p = - RTCORBA::ThreadpoolPolicy::_narrow (policy); + RTCORBA::ThreadpoolPolicy::_narrow (policy.in ()); if (CORBA::is_nil (p.in ())) ACE_THROW (CORBA::INTERNAL @@ -443,7 +399,7 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_RT_PRIVATE_CONNECTION_POLICY_TYPE: { RTCORBA::PrivateConnectionPolicy_var p = - RTCORBA::PrivateConnectionPolicy::_narrow (policy); + RTCORBA::PrivateConnectionPolicy::_narrow (policy.in ()); if (CORBA::is_nil (p.in ())) ACE_THROW (CORBA::INTERNAL @@ -464,7 +420,7 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_RT_PRIORITY_BANDED_CONNECTION_POLICY_TYPE: { RTCORBA::PriorityBandedConnectionPolicy_var p = - RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy); + RTCORBA::PriorityBandedConnectionPolicy::_narrow (policy.in ()); if (CORBA::is_nil (p.in ())) ACE_THROW (CORBA::INTERNAL @@ -496,7 +452,7 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( server_protocol_set = 0; RTCORBA::ServerProtocolPolicy_var p = - RTCORBA::ServerProtocolPolicy::_narrow (policy); + RTCORBA::ServerProtocolPolicy::_narrow (policy.in ()); if (CORBA::is_nil (p.in ())) ACE_THROW (CORBA::INTERNAL @@ -517,7 +473,7 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( case TAO_RT_CLIENT_PROTOCOL_POLICY_TYPE: { RTCORBA::ClientProtocolPolicy_var p = - RTCORBA::ClientProtocolPolicy::_narrow (policy); + RTCORBA::ClientProtocolPolicy::_narrow (policy.in ()); if (CORBA::is_nil (p.in ())) ACE_THROW (CORBA::INTERNAL @@ -608,9 +564,6 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( CORBA::ULong n = 0; if (types_length == 0) { - -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - if (this->relative_roundtrip_timeout_ != 0) { policy_list[n++] = @@ -618,8 +571,6 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( ACE_CHECK_RETURN (0); } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) if (this->client_priority_ != 0) @@ -631,8 +582,6 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - if (this->sync_scope_ != 0) { policy_list[n++] = @@ -640,8 +589,6 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( ACE_CHECK_RETURN (0); } -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) if (this->buffering_constraint_ != 0) @@ -717,8 +664,6 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( switch (slot) { -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE: if (this->relative_roundtrip_timeout_ != 0) { @@ -728,8 +673,6 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( } break; -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) case TAO_CLIENT_PRIORITY_POLICY_TYPE: @@ -743,8 +686,6 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE: if (this->sync_scope_ != 0) { @@ -754,8 +695,6 @@ TAO_Policy_Manager_Impl::get_policy_overrides ( } break; -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) case TAO_BUFFERING_CONSTRAINT_POLICY_TYPE: @@ -872,8 +811,6 @@ TAO_Policy_Manager_Impl::get_policy (CORBA::PolicyType type, switch (type) { -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - case TAO_MESSAGING_RELATIVE_RT_TIMEOUT_POLICY_TYPE: if (this->relative_roundtrip_timeout_ != 0) { @@ -881,8 +818,6 @@ TAO_Policy_Manager_Impl::get_policy (CORBA::PolicyType type, } return CORBA::Policy::_nil (); -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) case TAO_CLIENT_PRIORITY_POLICY_TYPE: @@ -894,8 +829,6 @@ TAO_Policy_Manager_Impl::get_policy (CORBA::PolicyType type, #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - case TAO_MESSAGING_SYNC_SCOPE_POLICY_TYPE: if (this->sync_scope_ != 0) { @@ -903,8 +836,6 @@ TAO_Policy_Manager_Impl::get_policy (CORBA::PolicyType type, } return CORBA::Policy::_nil (); -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) case TAO_BUFFERING_CONSTRAINT_POLICY_TYPE: @@ -994,12 +925,10 @@ TAO_Policy_Manager_Impl::get_policy (CORBA::PolicyType type, return CORBA::Policy::_nil (); } -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - -TAO_RelativeRoundtripTimeoutPolicy * +CORBA::Policy * TAO_Policy_Manager_Impl::relative_roundtrip_timeout (void) const { - TAO_RelativeRoundtripTimeoutPolicy *result = + CORBA::Policy *result = this->relative_roundtrip_timeout_; if (result != 0) @@ -1007,8 +936,6 @@ TAO_Policy_Manager_Impl::relative_roundtrip_timeout (void) const return result; } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) TAO_Client_Priority_Policy * @@ -1024,12 +951,10 @@ TAO_Policy_Manager_Impl::client_priority (void) const #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - -TAO_Sync_Scope_Policy * +CORBA::Policy * TAO_Policy_Manager_Impl::sync_scope (void) const { - TAO_Sync_Scope_Policy *result = + CORBA::Policy *result = this->sync_scope_; if (result != 0) @@ -1037,8 +962,6 @@ TAO_Policy_Manager_Impl::sync_scope (void) const return result; } -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) TAO_Buffering_Constraint_Policy * diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index b217c321b4b..dc04151dc59 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -100,11 +100,7 @@ public: // = Direct accesors to the policy implementations, for speedy // lookups. -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - - TAO_RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout (void) const; - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ + CORBA::Policy *relative_roundtrip_timeout (void) const; #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) @@ -112,11 +108,7 @@ public: #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - - TAO_Sync_Scope_Policy *sync_scope (void) const; - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ + CORBA::Policy *sync_scope (void) const; #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -154,11 +146,7 @@ private: // objects, this allow us to query the supported policies really // fast, without memory allocations. -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - - TAO_RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout_; - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ + CORBA::Policy *relative_roundtrip_timeout_; #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) @@ -166,11 +154,7 @@ private: #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - - TAO_Sync_Scope_Policy *sync_scope_; - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ + CORBA::Policy *sync_scope_; #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -229,11 +213,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, CORBA_InvalidPolicies)); -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - - TAO_RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout (void); - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ + CORBA::Policy *relative_roundtrip_timeout (void); #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) @@ -241,11 +221,7 @@ public: #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - - TAO_Sync_Scope_Policy *sync_scope (void); - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ + CORBA::Policy *sync_scope (void); #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -295,11 +271,7 @@ public: CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()); -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - - TAO_RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout (void) const; - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ + CORBA::Policy *relative_roundtrip_timeout (void) const; #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) @@ -307,11 +279,7 @@ public: #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - - TAO_Sync_Scope_Policy *sync_scope (void) const; - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ + CORBA::Policy *sync_scope (void) const; #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -367,11 +335,7 @@ public: ACE_THROW_SPEC ((CORBA::SystemException, CORBA_InvalidPolicies)); -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - - TAO_RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout (void) const; - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ + CORBA::Policy *relative_roundtrip_timeout (void) const; #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) @@ -379,11 +343,7 @@ public: #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - - TAO_Sync_Scope_Policy *sync_scope (void) const; - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ + CORBA::Policy *sync_scope (void) const; #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i index 68507d5c23b..5aae563badf 100644 --- a/TAO/tao/Policy_Manager.i +++ b/TAO/tao/Policy_Manager.i @@ -4,24 +4,16 @@ ACE_INLINE TAO_Policy_Manager_Impl::TAO_Policy_Manager_Impl (void) : count_ (0) { -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - this->relative_roundtrip_timeout_ = 0; -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) this->client_priority_ = 0; #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - this->sync_scope_ = 0; -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) this->buffering_constraint_ = 0; @@ -82,17 +74,13 @@ TAO_Policy_Manager::set_policy_overrides ( this->impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV); } -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - -ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Manager::relative_roundtrip_timeout (void) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.relative_roundtrip_timeout (); } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) ACE_INLINE TAO_Client_Priority_Policy * @@ -104,17 +92,13 @@ TAO_Policy_Manager::client_priority (void) #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - -ACE_INLINE TAO_Sync_Scope_Policy * +ACE_INLINE CORBA::Policy * TAO_Policy_Manager::sync_scope (void) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->impl_.sync_scope (); } -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) ACE_INLINE TAO_Buffering_Constraint_Policy * @@ -187,16 +171,12 @@ TAO_Policy_Current_Impl::get_policy ( return this->manager_impl_.get_policy (policy, ACE_TRY_ENV); } -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - -ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Current_Impl::relative_roundtrip_timeout (void) const { return this->manager_impl_.relative_roundtrip_timeout (); } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) ACE_INLINE TAO_Client_Priority_Policy * @@ -207,16 +187,12 @@ TAO_Policy_Current_Impl::client_priority (void) const #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - -ACE_INLINE TAO_Sync_Scope_Policy * +ACE_INLINE CORBA::Policy * TAO_Policy_Current_Impl::sync_scope (void) const { return this->manager_impl_.sync_scope (); } -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) ACE_INLINE TAO_Buffering_Constraint_Policy * @@ -286,9 +262,7 @@ TAO_Policy_Current::set_policy_overrides (const CORBA::PolicyList & policies, impl.set_policy_overrides (policies, set_add, ACE_TRY_ENV); } -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - -ACE_INLINE TAO_RelativeRoundtripTimeoutPolicy * +ACE_INLINE CORBA::Policy * TAO_Policy_Current::relative_roundtrip_timeout (void) const { TAO_Policy_Current_Impl &impl = this->implementation (); @@ -296,8 +270,6 @@ TAO_Policy_Current::relative_roundtrip_timeout (void) const return impl.relative_roundtrip_timeout (); } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) ACE_INLINE TAO_Client_Priority_Policy * @@ -310,9 +282,7 @@ TAO_Policy_Current::client_priority (void) const #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - -ACE_INLINE TAO_Sync_Scope_Policy * +ACE_INLINE CORBA::Policy * TAO_Policy_Current::sync_scope (void) const { TAO_Policy_Current_Impl &impl = this->implementation (); @@ -320,8 +290,6 @@ TAO_Policy_Current::sync_scope (void) const return impl.sync_scope (); } -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) ACE_INLINE TAO_Buffering_Constraint_Policy * diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index 161d0941a29..1e81a194d56 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -21,6 +21,8 @@ #include "PortableInterceptorC.h" +#if (TAO_HAS_INTERCEPTORS == 1) + #if !defined (__ACE_INLINE__) #include "PortableInterceptorC.i" #endif /* !defined INLINE */ @@ -83,7 +85,7 @@ void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -157,7 +159,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -170,7 +172,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -330,7 +332,7 @@ void PortableInterceptor::InvalidSlot::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -343,7 +345,7 @@ void PortableInterceptor::InvalidSlot::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -443,7 +445,7 @@ void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -511,7 +513,7 @@ void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -591,7 +593,7 @@ void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t t else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -671,7 +673,7 @@ void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t t else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -751,7 +753,7 @@ void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_ar else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -831,7 +833,7 @@ void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_ar else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -899,7 +901,7 @@ void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -979,7 +981,7 @@ void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1047,7 +1049,7 @@ void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1115,7 +1117,7 @@ void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1329,7 +1331,7 @@ void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptr_arith_t type else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1600,3 +1602,4 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto # pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ +#endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h index 2b5fbb0c961..f3a7762f5e4 100644 --- a/TAO/tao/PortableInterceptorC.h +++ b/TAO/tao/PortableInterceptorC.h @@ -53,6 +53,8 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +#if (TAO_HAS_INTERCEPTORS == 1) + TAO_NAMESPACE PortableInterceptor { @@ -2147,6 +2149,8 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::Inval #include "PortableInterceptorC.i" #endif /* defined INLINE */ +#endif /* TAO_HAS_INTERCEPTORS == 1 */ + #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index e9f744f0413..61755e091c1 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -95,8 +95,7 @@ CPPFLAGS += -I$(TAO_ROOT) .obj/PortableServer.o .obj/PortableServer.so .shobj/PortableServer.o .shobj/PortableServer.so: PortableServer.cpp PortableServer.h \ - $(ACE_ROOT)/ace/pre.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -221,8 +220,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -273,9 +271,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i poa_macros.h Servant_Base.h Servant_Base.i \ - Active_Object_Map.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h Servant_Base.h Servant_Base.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ @@ -285,8 +282,7 @@ CPPFLAGS += -I$(TAO_ROOT) Object_Adapter.i .obj/PortableServerC.o .obj/PortableServerC.so .shobj/PortableServerC.o .shobj/PortableServerC.so: PortableServerC.cpp PortableServerC.h \ - $(ACE_ROOT)/ace/pre.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -410,8 +406,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i POA.h Object_Adapter.h Key_Adapters.h \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + POA.h Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -455,8 +451,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -472,8 +468,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/LocalObject.i \ Object_Adapter.i POAManager.h POAManager.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - POA.i \ + $(TAO_ROOT)/tao/Object_KeyC.i POA.i \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ @@ -482,8 +477,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB.i .obj/RTPortableServerC.o .obj/RTPortableServerC.so .shobj/RTPortableServerC.o .shobj/RTPortableServerC.so: RTPortableServerC.cpp RTPortableServerC.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServerC.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -607,8 +602,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -617,8 +611,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i -.obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp POA.h \ - $(ACE_ROOT)/ace/pre.h \ +.obj/POA.o .obj/POA.so .shobj/POA.o .shobj/POA.so: POA.cpp POA.h $(ACE_ROOT)/ace/pre.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -654,9 +647,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - Object_Adapter.h portableserver_export.h Key_Adapters.h \ - PortableServerC.h \ + $(ACE_ROOT)/ace/Malloc_Base.h Object_Adapter.h \ + portableserver_export.h Key_Adapters.h PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -744,8 +736,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -789,8 +780,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -806,8 +797,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/LocalObject.i \ Object_Adapter.i POAManager.h POAManager.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - POA.i Collocated_Object.h Collocated_Object.i ImplRepoS.h ImplRepoC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i POA.i \ + Collocated_Object.h Collocated_Object.i ImplRepoS.h ImplRepoC.h \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -928,8 +919,7 @@ CPPFLAGS += -I$(TAO_ROOT) Forwarding_Servant.h .obj/Default_Acceptor_Filter.o .obj/Default_Acceptor_Filter.so .shobj/Default_Acceptor_Filter.o .shobj/Default_Acceptor_Filter.so: Default_Acceptor_Filter.cpp \ - Default_Acceptor_Filter.h \ - $(ACE_ROOT)/ace/pre.h \ + Default_Acceptor_Filter.h $(ACE_ROOT)/ace/pre.h \ portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -1108,14 +1098,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Pluggable.i .obj/Object_Adapter.o .obj/Object_Adapter.so .shobj/Object_Adapter.o .shobj/Object_Adapter.so: Object_Adapter.cpp Object_Adapter.h \ - $(ACE_ROOT)/ace/pre.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h portableserver_export.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 \ - Key_Adapters.h PortableServerC.h \ + $(ACE_ROOT)/ace/ace_wchar.inl Key_Adapters.h \ + PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -1234,8 +1223,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -1279,8 +1267,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1296,8 +1284,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/LocalObject.i \ Object_Adapter.i POA.h POAManager.h POAManager.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - POA.i Strategized_Object_Proxy_Broker.h \ + $(TAO_ROOT)/tao/Object_KeyC.i POA.i \ + Strategized_Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -1449,8 +1437,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timeprobe.h .obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp Operation_Table.h \ - $(ACE_ROOT)/ace/pre.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1621,8 +1608,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB.i .obj/Key_Adapters.o .obj/Key_Adapters.so .shobj/Key_Adapters.o .shobj/Key_Adapters.so: Key_Adapters.cpp Key_Adapters.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServerC.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1746,8 +1733,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -1791,12 +1777,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i .obj/POAManager.o .obj/POAManager.so .shobj/POAManager.o .shobj/POAManager.so: POAManager.cpp POAManager.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServerC.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1920,11 +1905,10 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i poa_macros.h \ - $(TAO_ROOT)/tao/LocalObject.h \ - $(TAO_ROOT)/tao/LocalObject.i \ - POAManager.i POA.h Object_Adapter.h Key_Adapters.h \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + poa_macros.h $(TAO_ROOT)/tao/LocalObject.h \ + $(TAO_ROOT)/tao/LocalObject.i POAManager.i \ + POA.h Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -1968,8 +1952,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -1980,15 +1964,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - Object_Adapter.i \ + $(TAO_ROOT)/tao/Adapter.i Object_Adapter.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - POA.i + $(TAO_ROOT)/tao/Object_KeyC.i 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 \ @@ -2112,8 +2094,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -2157,17 +2138,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i Servant_Base.h Servant_Base.i \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + Servant_Base.h Servant_Base.i \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - Active_Object_Map.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ + Active_Object_Map.i $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp .obj/Servant_Base.o .obj/Servant_Base.so .shobj/Servant_Base.o .shobj/Servant_Base.so: Servant_Base.cpp Servant_Base.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServerC.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2291,9 +2271,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i Servant_Base.i POA.h Object_Adapter.h \ - Key_Adapters.h \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + Servant_Base.i POA.h Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -2337,8 +2316,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -2354,8 +2333,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/LocalObject.i \ Object_Adapter.i POAManager.h POAManager.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - POA.i Operation_Table.h \ + $(TAO_ROOT)/tao/Object_KeyC.i POA.i \ + Operation_Table.h \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -2500,9 +2479,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Sock_Connect.i \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - Object_Adapter.h portableserver_export.h Key_Adapters.h \ - PortableServerC.h \ + $(ACE_ROOT)/ace/Malloc_Base.h Object_Adapter.h \ + portableserver_export.h Key_Adapters.h PortableServerC.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -2590,8 +2568,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -2635,8 +2612,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -2652,8 +2629,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/LocalObject.i \ Object_Adapter.i POAManager.h POAManager.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - POA.i ThruPOA_Object_Proxy_Impl.h \ + $(TAO_ROOT)/tao/Object_KeyC.i POA.i \ + ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ @@ -2840,8 +2817,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - Object_Adapter.h Key_Adapters.h PortableServerC.h \ + $(TAO_ROOT)/tao/corbafwd.i Object_Adapter.h \ + Key_Adapters.h PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ @@ -2871,8 +2848,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -2916,8 +2892,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -3252,8 +3228,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h .obj/Collocated_Object.o .obj/Collocated_Object.so .shobj/Collocated_Object.o .shobj/Collocated_Object.so: Collocated_Object.cpp Collocated_Object.h \ - $(ACE_ROOT)/ace/pre.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3351,8 +3326,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \ - $(TAO_ROOT)/tao/Object.i \ - Servant_Base.h PortableServerC.h \ + $(TAO_ROOT)/tao/Object.i Servant_Base.h \ + PortableServerC.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ @@ -3378,9 +3353,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i Servant_Base.i Collocated_Object.i Object_Adapter.h \ - Key_Adapters.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 \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -3424,8 +3398,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -3439,8 +3413,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ + Object_Adapter.i $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ @@ -3531,8 +3504,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Stub.i .obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainS.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServerC.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -3656,8 +3629,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i POA_CORBA.h Servant_Base.h Servant_Base.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + POA_CORBA.h Servant_Base.h Servant_Base.i \ $(TAO_ROOT)/tao/DomainC.h \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ @@ -3683,9 +3656,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/DomainC.i \ Collocated_Object.h Collocated_Object.i ServerRequestInfo.h \ $(TAO_ROOT)/tao/OctetSeqC.h \ - $(TAO_ROOT)/tao/OctetSeqC.i \ - DomainS_T.h DomainS_T.i DomainS_T.cpp DomainS.i Object_Adapter.h \ - Key_Adapters.h \ + $(TAO_ROOT)/tao/OctetSeqC.i DomainS_T.h \ + DomainS_T.i DomainS_T.cpp DomainS.i Object_Adapter.h Key_Adapters.h \ $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ @@ -3729,16 +3701,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - Object_Adapter.i Operation_Table.h \ + $(TAO_ROOT)/tao/Adapter.i Object_Adapter.i \ + Operation_Table.h \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -3925,8 +3897,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/CORBA_macros.h \ $(TAO_ROOT)/tao/varbase.h \ $(TAO_ROOT)/tao/TAO_Export.h \ - $(TAO_ROOT)/tao/corbafwd.i \ - Servant_Base.h PortableServerC.h portableserver_export.h \ + $(TAO_ROOT)/tao/corbafwd.i Servant_Base.h \ + PortableServerC.h portableserver_export.h \ $(TAO_ROOT)/tao/CurrentC.h \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \ @@ -3957,9 +3929,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i Servant_Base.i \ - $(TAO_ROOT)/tao/DomainC.h \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + Servant_Base.i $(TAO_ROOT)/tao/DomainC.h \ $(TAO_ROOT)/tao/ClientRequestInfo.h \ $(TAO_ROOT)/tao/PortableInterceptorC.h \ $(TAO_ROOT)/tao/DynamicC.h \ @@ -3981,9 +3952,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/LocalObject.i \ $(TAO_ROOT)/tao/StringSeqC.h \ $(TAO_ROOT)/tao/StringSeqC.i \ - $(TAO_ROOT)/tao/DomainC.i \ - Object_Adapter.h Key_Adapters.h \ - $(ACE_ROOT)/ace/Map.h \ + $(TAO_ROOT)/tao/DomainC.i Object_Adapter.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 \ @@ -4026,16 +3996,16 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i Active_Object_Map.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ Active_Object_Map.i \ $(TAO_ROOT)/tao/Adapter.h \ - $(TAO_ROOT)/tao/Adapter.i \ - Object_Adapter.i Operation_Table.h \ + $(TAO_ROOT)/tao/Adapter.i Object_Adapter.i \ + Operation_Table.h \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -4128,8 +4098,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Stub.i .obj/ORB_Manager.o .obj/ORB_Manager.so .shobj/ORB_Manager.o .shobj/ORB_Manager.so: ORB_Manager.cpp ORB_Manager.h \ - $(ACE_ROOT)/ace/pre.h \ - PortableServer.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h PortableServer.h \ + portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4254,16 +4224,14 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ $(TAO_ROOT)/tao/RTCORBAC.i \ - RTPortableServerC.i \ - $(TAO_ROOT)/tao/ORB.h \ + RTPortableServerC.i $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -4443,8 +4411,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 \ - Servant_Base.h PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/OS.i Servant_Base.h \ + PortableServerC.h portableserver_export.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -4546,9 +4514,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i Servant_Base.i \ - $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + Servant_Base.i $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -4556,8 +4523,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/ORB.i .obj/ImplRepoC.o .obj/ImplRepoC.so .shobj/ImplRepoC.o .shobj/ImplRepoC.so: ImplRepoC.cpp ImplRepoC.h \ - $(ACE_ROOT)/ace/pre.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -4687,8 +4653,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \ - ImplRepoC.i \ - $(TAO_ROOT)/tao/Stub.h \ + ImplRepoC.i $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -4837,8 +4802,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 \ @@ -4973,9 +4938,9 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/Encodable.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - PortableServerC.i Servant_Base.i ImplRepoS_T.h ImplRepoS_T.i \ - ImplRepoS_T.cpp ImplRepoS.i Operation_Table.h \ + $(TAO_ROOT)/tao/PolicyC.i PortableServerC.i \ + Servant_Base.i ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp \ + ImplRepoS.i Operation_Table.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ $(ACE_ROOT)/ace/Functor.h \ $(ACE_ROOT)/ace/Functor.i \ @@ -5020,8 +4985,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/IOPC.h \ $(TAO_ROOT)/tao/IOPC.i \ @@ -5035,8 +5000,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Adapter.i \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i \ - Object_Adapter.i \ - $(TAO_ROOT)/tao/Stub.h \ + Object_Adapter.i $(TAO_ROOT)/tao/Stub.h \ $(TAO_ROOT)/tao/Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ @@ -5151,8 +5115,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 \ - MessagingS.h PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/OS.i MessagingS.h \ + PortableServerC.h portableserver_export.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ @@ -5254,9 +5218,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Environment.i \ $(TAO_ROOT)/tao/PolicyC.i \ $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - PortableServerC.i Servant_Base.h Servant_Base.i Collocated_Object.h \ - Collocated_Object.i \ + $(TAO_ROOT)/tao/Any.i PortableServerC.i \ + Servant_Base.h Servant_Base.i Collocated_Object.h Collocated_Object.i \ $(TAO_ROOT)/tao/TimeBaseS.h \ $(TAO_ROOT)/tao/TimeBaseC.h \ $(TAO_ROOT)/tao/TimeBaseC.i \ @@ -5273,9 +5236,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/IOPC.i \ $(TAO_ROOT)/tao/PollableC.h \ $(TAO_ROOT)/tao/PollableC.i \ - $(TAO_ROOT)/tao/MessagingC.i \ - MessagingS_T.h MessagingS_T.i MessagingS_T.cpp MessagingS.i \ - Operation_Table.h \ + $(TAO_ROOT)/tao/MessagingC.i MessagingS_T.h \ + MessagingS_T.i MessagingS_T.cpp MessagingS.i Operation_Table.h \ $(TAO_ROOT)/tao/TAO_Singleton.h \ $(TAO_ROOT)/tao/TAO_Singleton.inl \ $(TAO_ROOT)/tao/TAO_Singleton.cpp \ @@ -5330,8 +5292,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(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 \ - Key_Adapters.i poa_macros.h RTPortableServerC.h \ + $(ACE_ROOT)/ace/Map_T.cpp Key_Adapters.i \ + poa_macros.h RTPortableServerC.h \ $(TAO_ROOT)/tao/RTCORBAC.h \ $(TAO_ROOT)/tao/RTCORBAC.i \ RTPortableServerC.i Active_Object_Map.h \ @@ -5449,8 +5411,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 \ - portableserver_export.h \ + $(ACE_ROOT)/ace/OS.i portableserver_export.h \ $(TAO_ROOT)/tao/Acceptor_Filter.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ diff --git a/TAO/tao/Remote_Object_Proxy_Impl.cpp b/TAO/tao/Remote_Object_Proxy_Impl.cpp index 5fad91605c7..a924ce7c12d 100644 --- a/TAO/tao/Remote_Object_Proxy_Impl.cpp +++ b/TAO/tao/Remote_Object_Proxy_Impl.cpp @@ -20,7 +20,7 @@ TAO_Remote_Object_Proxy_Impl::_is_a (const CORBA::Object_ptr target, // Here we go remote to answer the question. CORBA::Boolean _tao_retval = 0; - + TAO_Stub *istub = target->_stubobj (); if (istub == 0) ACE_THROW_RETURN (CORBA::INTERNAL ( diff --git a/TAO/tao/SHMIOP_Connect.cpp b/TAO/tao/SHMIOP_Connect.cpp index d16c3c1b80e..9f1a4624d3a 100644 --- a/TAO/tao/SHMIOP_Connect.cpp +++ b/TAO/tao/SHMIOP_Connect.cpp @@ -480,27 +480,11 @@ TAO_SHMIOP_Client_Connection_Handler::handle_timeout (const ACE_Time_Value &, ACE_Time_Value *max_wait_time = 0; -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - - TAO_RelativeRoundtripTimeoutPolicy *timeout_policy = - this->orb_core_->stubless_relative_roundtrip_timeout (); - - // Automatically release the policy - CORBA::Object_var auto_release = timeout_policy; - - ACE_Time_Value max_wait_time_value; - - // If max_wait_time is not zero then this is not the first attempt - // to send the request, the timeout value includes *all* those - // attempts. - if (timeout_policy != 0) - { - timeout_policy->set_time_value (max_wait_time_value); - max_wait_time = &max_wait_time_value; - } - - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ + TAO_Stub *stub = 0; + int has_timeout; + this->orb_core_->call_timeout_hook (stub, + has_timeout, + *max_wait_time); // Cannot deal with errors, and therefore they are ignored. this->transport ()->send_buffered_messages (max_wait_time); diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index f21710d9208..04d410babd9 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -63,11 +63,9 @@ ACE_RCSID(tao, TAO_Stub, "$Id$") orb_core_ (orb_core), orb_ (), servant_orb_ (), -#if (TAO_HAS_CORBA_MESSAGING == 1) - + #if (TAO_HAS_CORBA_MESSAGING == 1) policies_ (0), - -#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ + #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ addressing_mode_ (0) { @@ -962,46 +960,35 @@ TAO_Sync_Strategy & TAO_Stub::sync_strategy (void) { -#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 && \ - TAO_HAS_SYNC_SCOPE_POLICY == 1) - - Messaging::SyncScopePolicy *policy = - this->sync_scope (); - - if (policy != 0) - { - Messaging::SyncScope scope = policy->synchronization (); +#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) - if (scope == Messaging::SYNC_WITH_TRANSPORT || - scope == Messaging::SYNC_WITH_SERVER || - scope == Messaging::SYNC_WITH_TARGET) - return this->orb_core_->transport_sync_strategy (); + int has_synchronization; + int scope; - if (scope == Messaging::SYNC_NONE || - scope == Messaging::SYNC_EAGER_BUFFERING) - return this->orb_core_->eager_buffering_sync_strategy (); + this->orb_core_->call_sync_scope_hook (this, + has_synchronization, + scope); - if (scope == Messaging::SYNC_DELAYED_BUFFERING) - return this->orb_core_->delayed_buffering_sync_strategy (); - } + if (has_synchronization == 1) + return this->orb_core_->get_sync_strategy (this, + scope); -#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 && - TAO_HAS_SYNC_SCOPE_POLICY == 1 */ +#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ return this->orb_core_->transport_sync_strategy (); } -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - -TAO_RelativeRoundtripTimeoutPolicy * +CORBA::Policy * TAO_Stub::relative_roundtrip_timeout (void) { - TAO_RelativeRoundtripTimeoutPolicy *result = 0; + CORBA::Policy *result = 0; + + this->policies_ = 0; // No need to lock, the stub only changes its policies at // construction time... if (this->policies_ != 0) - result = this->policies_->relative_roundtrip_timeout (); + result = this->policies_->relative_roundtrip_timeout (); // No need to lock, the object is in TSS storage.... if (result == 0) @@ -1028,8 +1015,6 @@ TAO_Stub::relative_roundtrip_timeout (void) return result; } -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ - #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) TAO_Client_Priority_Policy * @@ -1069,45 +1054,21 @@ TAO_Stub::client_priority (void) #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - -TAO_Sync_Scope_Policy * +CORBA::Policy * TAO_Stub::sync_scope (void) { - TAO_Sync_Scope_Policy *result = 0; + CORBA::Policy *result = 0; // No need to lock, the stub only changes its policies at // construction time... if (this->policies_ != 0) result = this->policies_->sync_scope (); - - // No need to lock, the object is in TSS storage.... - if (result == 0) - { - TAO_Policy_Current &policy_current = - this->orb_core_->policy_current (); - result = policy_current.sync_scope (); - } - - // @@ Must lock, but is is harder to implement than just modifying - // this call: the ORB does take a lock to modify the policy - // manager - if (result == 0) - { - TAO_Policy_Manager *policy_manager = - this->orb_core_->policy_manager (); - if (policy_manager != 0) - result = policy_manager->sync_scope (); - } - - if (result == 0) - result = this->orb_core_->default_sync_scope (); - + + this->orb_core_->stubless_sync_scope (result); + return result; } -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ - #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) TAO_Buffering_Constraint_Policy * diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 69d083ead35..d1faaeaf947 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -214,11 +214,7 @@ public: // Object scope, then at the Current scope, then at the ORB scope, // and, finally, ORB default values are checked. -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - - TAO_RelativeRoundtripTimeoutPolicy *relative_roundtrip_timeout (void); - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ + CORBA::Policy *relative_roundtrip_timeout (void); #if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) @@ -226,11 +222,7 @@ public: #endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */ -#if (TAO_HAS_SYNC_SCOPE_POLICY == 1) - - TAO_Sync_Scope_Policy *sync_scope (void); - -#endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */ + CORBA::Policy *sync_scope (void); #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -496,13 +488,13 @@ private: // 2. we can search for the servant/POA's status starting from // the ORB's RootPOA. -#if (TAO_HAS_CORBA_MESSAGING == 1) + #if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Manager_Impl *policies_; // The policy overrides in this object, if nil then use the default // policies. -#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ + #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ CORBA::Short addressing_mode_; // The addressing mode diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp index 50e2de2355c..0eb46129995 100644 --- a/TAO/tao/UIOP_Connect.cpp +++ b/TAO/tao/UIOP_Connect.cpp @@ -466,27 +466,11 @@ TAO_UIOP_Client_Connection_Handler::handle_timeout (const ACE_Time_Value &, // ACE_Time_Value *max_wait_time = 0; - -#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1) - - TAO_RelativeRoundtripTimeoutPolicy *timeout_policy = - this->orb_core_->stubless_relative_roundtrip_timeout (); - - // Automatically release the policy - CORBA::Object_var auto_release = timeout_policy; - - ACE_Time_Value max_wait_time_value; - - // If max_wait_time is not zero then this is not the first attempt - // to send the request, the timeout value includes *all* those - // attempts. - if (timeout_policy != 0) - { - timeout_policy->set_time_value (max_wait_time_value); - max_wait_time = &max_wait_time_value; - } - -#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */ + TAO_Stub *stub = 0; + int has_timeout; + this->orb_core_->call_timeout_hook (stub, + has_timeout, + *max_wait_time); // Cannot deal with errors, and therefore they are ignored. this->transport ()->send_buffered_messages (max_wait_time); |