diff options
Diffstat (limited to 'TAO/tao/ORB_Core.h')
| -rw-r--r-- | TAO/tao/ORB_Core.h | 56 |
1 files changed, 32 insertions, 24 deletions
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 14e6b7cdc17..0130f38df11 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -1,6 +1,7 @@ // This may look like C, but it's really -*- C++ -*- // $Id$ + // ============================================================================ // // = LIBRARY @@ -30,6 +31,7 @@ #include "tao/POAC.h" + #include "ace/Map_Manager.h" #include "ace/Singleton.h" @@ -53,12 +55,11 @@ class TAO_Reactor_Registry; class TAO_Leader_Follower; class TAO_Priority_Mapping; -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) class TAO_None_Sync_Strategy; -class TAO_Flush_Sync_Strategy; -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ class TAO_Transport_Sync_Strategy; @@ -306,7 +307,8 @@ public: // on the heap and/or as class members; we need to investigate the // tradeoffs and take a decision. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) + TAO_Policy_Manager *policy_manager (void); // Return the Policy_Manager for this ORB. @@ -323,7 +325,7 @@ public: // type. // If there is no default policy it returns CORBA::Policy::_nil () - TAO_RelativeRoundtripTimeoutPolicy_i *default_relative_roundtrip_timeout (void) const; + TAO_RelativeRoundtripTimeoutPolicy *default_relative_roundtrip_timeout (void) const; TAO_Client_Priority_Policy *default_client_priority (void) const; @@ -331,35 +333,33 @@ public: TAO_Buffering_Constraint_Policy *default_buffering_constraint (void) const; -#endif /* TAO_HAS_CORBA_MESSAGING */ - -#if defined (TAO_HAS_CORBA_MESSAGING) - TAO_None_Sync_Strategy &none_sync_strategy (void); // This strategy will buffer messages. - TAO_Flush_Sync_Strategy &flush_sync_strategy (void); - // This strategy will flush any buffered messages. + TAO_RelativeRoundtripTimeoutPolicy *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_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_Transport_Sync_Strategy &transport_sync_strategy (void); // This strategy will sync with the transport. -#if defined (TAO_HAS_RT_CORBA) +#if (TAO_HAS_RT_CORBA == 1) TAO_Priority_Mapping *priority_mapping (void); // Access the priority mapping class, this is a TAO extension but // there is no standard way to get to it either. -#endif /* TAO_HAS_RT_CORBA */ +#endif /* TAO_HAS_RT_CORBA == 1 */ int get_thread_priority (CORBA::Short &priority); int set_thread_priority (CORBA::Short priority); // Accessor and modifier to the current thread priority, used to // implement the RTCORBA::Current interface, but it is faster for // some critical components. - // If TAO_HAS_RT_CORBA is not defined the operations are noops. + // If TAO_HAS_RT_CORBA == 0, the operations are noops. TAO_ORB_Core_TSS_Resources* get_tss_resources (void); // Obtain the TSS resources of this orb. @@ -406,6 +406,10 @@ public: const char *orbid (void) const; // Return ORBid string. + CORBA::Object_ptr implrepo_service (void); + void implrepo_service (const CORBA::Object_ptr ir); + // Set/Get the IOR of the Implementation Repository service. + protected: int set_iiop_endpoint (int dotted_decimal_addresses, CORBA::UShort port, @@ -456,6 +460,13 @@ protected: TAO_ProtocolFactorySet *protocol_factories_; // Pointer to the list of protocol loaded into this ORB instance. + CORBA::Object_ptr implrepo_service_; + // The cached IOR for the Implementation Repository. + // @@ If this is a _var, where should it get deleted? (brunsch) + + int use_implrepo_; + // Flag for whether the implrepo support is enabled or not. + CORBA::ORB_var orb_; // @@ Should we keep a single ORB pointer? This is good because // multiple calls to ORB_init() with the same ORBid can use the @@ -514,7 +525,7 @@ protected: CORBA::ULong collocation_strategy_; // Default collocation policy. This should never be ORB_CONTROL. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Manager *policy_manager_; // The Policy_Manager for this ORB. @@ -523,7 +534,7 @@ protected: TAO_Policy_Current *policy_current_; // Policy current. -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_POA_Current *poa_current_; // POA current. @@ -580,15 +591,12 @@ protected: TAO_Priority_Mapping *priority_mapping_; // The priority mapping. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_None_Sync_Strategy *none_sync_strategy_; // This strategy will buffer messages. - TAO_Flush_Sync_Strategy *flush_sync_strategy_; - // This strategy will flush any buffered messages. - -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ TAO_Transport_Sync_Strategy *transport_sync_strategy_; // This strategy will sync with the transport. @@ -662,14 +670,14 @@ public: // If the user (or library) provides no environment the ORB_Core // still holds one. -#if defined (TAO_HAS_CORBA_MESSAGING) +#if (TAO_HAS_CORBA_MESSAGING == 1) TAO_Policy_Current_Impl initial_policy_current_; // The initial PolicyCurrent for this thread. Should be a TSS // resource. TAO_Policy_Current_Impl *policy_current_; // This pointer is reset by the POA on each upcall. -#endif /* TAO_HAS_CORBA_MESSAGING */ +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ }; // @@ Must go away.... |