summaryrefslogtreecommitdiff
path: root/TAO/tao/ORB_Core.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/ORB_Core.h')
-rw-r--r--TAO/tao/ORB_Core.h154
1 files changed, 65 insertions, 89 deletions
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 2a879aa4216..a9836d08857 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -55,6 +55,7 @@ class TAO_Connector_Registry;
class TAO_Resource_Factory;
class TAO_Client_Strategy_Factory;
class TAO_Server_Strategy_Factory;
+class TAO_Transport_Cache_Manager;
class TAO_TSS_Resources;
class TAO_Leader_Follower;
@@ -85,6 +86,7 @@ class TAO_Policy_Manager;
class TAO_Policy_Current;
class TAO_Codeset_Manager;
+class TAO_IORInterceptor_List;
class TAO_IORInterceptor_Adapter;
class TAO_Valuetype_Adapter;
@@ -172,10 +174,6 @@ public:
/// Generic container for thread-specific objects.
ACE_Array_Base<void *> ts_objects_;
- // Set to true by the wait_on_lf_no_nested_upcall wait strategy
- // @CJC@ maybe we should use allocate_tss_slot_id() instead?
- bool upcalls_temporarily_suspended_on_this_thread_;
-
/// Pointer to the ORB core. Needed to get access to the TSS
/// cleanup functions for the TSS objects stored in the TSS object
/// array in this class.
@@ -934,14 +932,15 @@ public:
void add_interceptor (
PortableInterceptor::IORInterceptor_ptr interceptor
ACE_ENV_ARG_DECL);
+
+ TAO_IORInterceptor_List *ior_interceptor_list (void);
//@}
/// Return the valuetype adapter
TAO_Valuetype_Adapter *& valuetype_adapter (void);
- /// Get the IOR Interceptor adapter. If not created, this method will try
- /// to create one.
- TAO_IORInterceptor_Adapter *ior_interceptor_adapter (void);
+ /// Return the underlying transport cache
+ TAO_Transport_Cache_Manager *transport_cache (void);
/// Set and Get methods to indicate whether a BiDir IIOP policy has
/// been set in the POA.
@@ -1078,6 +1077,8 @@ private:
CORBA::Boolean is_collocation_enabled (TAO_ORB_Core *other_orb,
const TAO_MProfile &mp);
+ TAO_IORInterceptor_Adapter *ior_interceptor_adapter (void);
+
protected:
/// Synchronize internal state...
@@ -1348,11 +1349,10 @@ public:
// The hook to be set for the SyncScopePolicy
TAO_ORB_Core::Sync_Scope_Hook sync_scope_hook_;
- /**
- * Name of the protocols_hooks that needs to be instantiated.
- * The default value is "Protocols_Hooks". If RTCORBA option is
- * set, its value will be set to be "RT_Protocols_Hooks".
- */
+ // Name of the protocols_hooks that needs to be instantiated.
+ // The default value is "Protocols_Hooks". If RTCORBA option is
+ // set, its value will be set to
+ // be "RT_Protocols_Hooks".
ACE_CString protocols_hooks_name_;
/// The hook to be set for the RelativeRoundtripTimeoutPolicy.
@@ -1361,105 +1361,81 @@ public:
/// The hook to be set for the ConnectionTimeoutPolicy
TAO_ORB_Core::Timeout_Hook connection_timeout_hook_;
- /**
- * Name of the endpoint selector factory that needs to be instantiated.
- * The default value is "Default_Endpoint_Selector_Factory". If
- * TAO_RTCORBA is linked, the set_endpoint_selector_factory will be
- * called to set the value to be "RT_Endpoint_Selector_Factory".
- */
+ // Name of the endpoint selector factory that needs to be instantiated.
+ // The default value is "Default_Endpoint_Selector_Factory". If
+ // TAO_RTCORBA is linked, the set_endpoint_selector_factory will be
+ // called to set the value to be "RT_Endpoint_Selector_Factory".
ACE_CString endpoint_selector_factory_name_;
- /**
- * Name of the thread lane resources manager that needs to be
- * instantiated. The default value is
- * "Default_Thread_Lane_Resources_Manager_Factory". If TAO_RTCORBA
- * is linked, the set_thread_lane_resources_manager will be called
- * to set the value to be
- * "RT_Thread_Lane_Resources_Manager_Factory".
- */
+ // Name of the thread lane resources manager that needs to be
+ // instantiated. The default value is
+ // "Default_Thread_Lane_Resources_Manager_Factory". If TAO_RTCORBA
+ // is linked, the set_thread_lane_resources_manager will be called
+ // to set the value to be
+ // "RT_Thread_Lane_Resources_Manager_Factory".
ACE_CString thread_lane_resources_manager_factory_name_;
- /**
- * Name of the collocation resolver that needs to be instantiated.
- * The default value is "Default_Collocation_Resolver". If
- * TAO_RTCORBA is linked, the set_collocation_resolver will be
- * called to set the value to be "RT_Collocation_Resolver".
- */
+ // Name of the collocation resolver that needs to be instantiated.
+ // The default value is "Default_Collocation_Resolver". If
+ // TAO_RTCORBA is linked, the set_collocation_resolver will be
+ // called to set the value to be "RT_Collocation_Resolver".
ACE_CString collocation_resolver_name_;
- /**
- * Name of the stub factory that needs to be instantiated.
- * The default value is "Default_Stub_Factory". If TAO_RTCORBA is
- * linked, the set_stub_factory will be called to set the value
- * to be "RT_Stub_Factory".
- */
+ // Name of the stub factory that needs to be instantiated.
+ // The default value is "Default_Stub_Factory". If TAO_RTCORBA is
+ // linked, the set_stub_factory will be called to set the value
+ // to be "RT_Stub_Factory".
ACE_CString stub_factory_name_;
- /**
- * Name of the resource factory that needs to be instantiated.
- * The default value is "Resource_Factory". If TAO_Strategies is
- * linked, the set_resource_factory will be called to set the value
- * to be "Advanced_Resource_Factory".
- */
+ // Name of the resource factory that needs to be instantiated.
+ // The default value is "Resource_Factory". If TAO_Strategies is
+ // linked, the set_resource_factory will be called to set the value
+ // to be "Advanced_Resource_Factory".
ACE_CString resource_factory_name_;
- /**
- * Name of the service object for DII request creation that needs
- * to be instantiated. The default value is "Dynamic_Adaper". If
- * TAO_DynamicInterface is linked, dynamic_adapter_name() will be
- * called to set the value to "Concrete_Dynamic_Adapter".
- */
+ // Name of the service object for DII request creation that needs
+ // to be instantiated. The default value is "Dynamic_Adaper". If
+ // TAO_DynamicInterface is linked, dynamic_adapter_name() will be
+ // called to set the value to "Concrete_Dynamic_Adapter".
ACE_CString dynamic_adapter_name_;
- /**
- * Name of the service object for functions that make calls on
- * the Interface Repository. The default value is "IFR_Client_Adaper".
- * If TAO_IFR_CLient is linked, ifr_client_adapter_name() will be
- * called to set the value to "Concrete_IFR_Client_Adapter".
- */
+ // Name of the service object for functions that make calls on
+ // the Interface Repository. The default value is "IFR_Client_Adaper".
+ // If TAO_IFR_CLient is linked, ifr_client_adapter_name() will be
+ // called to set the value to "Concrete_IFR_Client_Adapter".
ACE_CString ifr_client_adapter_name_;
- /**
- * Name of the service object used by the ORB create_*_tc functions.
- * The default value is "TypeCodeFactory_Adapter". If the
- * TypeCodeFactory library is linked, the corresponding accessor
- * function typecodefactory_adapter_name() will be called to set
- * the value to "Concrete_TypeCodeFactory_Adapter".
- */
+ // Name of the service object used by the ORB create_*_tc functions.
+ // The default value is "TypeCodeFactory_Adapter". If the
+ // TypeCodeFactory library is linked, the corresponding accessor
+ // function typecodefactory_adapter_name() will be called to set
+ // the value to "Concrete_TypeCodeFactory_Adapter".
ACE_CString typecodefactory_adapter_name_;
- /**
- * Name of the factory object used to adapt function calls on
- * the PortableInterceptor interfaces IORInfo and IORInterceptor.
- * The default value is "IORInterceptor_Adapter_Factory". If the
- * IORInterceptor library is linked, the corresponding accessor
- * function iorinterceptor_adapter_factory_name() will be called to set
- * the value to "Concrete_IORInterceptor_Adapter_Factory".
- */
+ // Name of the factory object used to adapt function calls on
+ // the PortableInterceptor interfaces IORInfo and IORInterceptor.
+ // The default value is "IORInterceptor_Adapter_Factory". If the
+ // IORInterceptor library is linked, the corresponding accessor
+ // function iorinterceptor_adapter_factory_name() will be called to set
+ // the value to "Concrete_IORInterceptor_Adapter_Factory".
ACE_CString iorinterceptor_adapter_factory_name_;
- /**
- * Name of the service object used to adapt function calls on
- * the valuetype-related interfaces.
- * The default value is "Valuetype_Adapter". If the
- * Valuetype library is linked, the corresponding accessor
- * function valuetype_adapter_name() will be called to set
- * the value to "Concrete_Valuetype_Adapter".
- */
+ // Name of the service object used to adapt function calls on
+ // the valuetype-related interfaces.
+ // The default value is "Valuetype_Adapter". If the
+ // Valuetype library is linked, the corresponding accessor
+ // function valuetype_adapter_name() will be called to set
+ // the value to "Concrete_Valuetype_Adapter".
ACE_CString valuetype_adapter_name_;
- /**
- * Name of the service object used to create the RootPOA. The
- * default value is "TAO_POA". If TAO_RTCORBA is loaded, this
- * will be changed to TAO_RT_POA so that a POA equipped with
- * realtime extensions will be returned.
- */
+ // Name of the service object used to create the RootPOA. The
+ // default value is "TAO_POA". If TAO_RTCORBA is loaded, this
+ // will be changed to TAO_RT_POA so that a POA equipped with
+ // realtime extensions will be returned.
ACE_CString poa_factory_name_;
- /**
- * The service configurator directive used to load
- * poa_factory_name_ dynamically.
- */
+ // The service configurator directive used to load
+ // poa_factory_name_ dynamically.
ACE_CString poa_factory_directive_;
private: