diff options
Diffstat (limited to 'TAO/tao/RTCORBA/RT_ORBInitializer.cpp')
| -rw-r--r-- | TAO/tao/RTCORBA/RT_ORBInitializer.cpp | 56 |
1 files changed, 25 insertions, 31 deletions
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp index 464c35660aa..58c599a21ad 100644 --- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp +++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp @@ -1,4 +1,4 @@ -#include "tao/RTCORBA/RT_ORBInitializer.h" +#include "RT_ORBInitializer.h" #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 @@ -11,21 +11,21 @@ ACE_RCSID (RTCORBA, #include "tao/RTCORBA/RTCORBAC.h" #undef TAO_RTCORBA_SAFE_INCLUDE -#include "tao/RTCORBA/RT_Policy_i.h" -#include "tao/RTCORBA/RT_PolicyFactory.h" -#include "tao/RTCORBA/RT_Protocols_Hooks.h" -#include "tao/RTCORBA/Priority_Mapping_Manager.h" -#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h" -#include "tao/RTCORBA/RT_ORB_Loader.h" -#include "tao/RTCORBA/RT_Stub_Factory.h" -#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h" -#include "tao/RTCORBA/Continuous_Priority_Mapping.h" -#include "tao/RTCORBA/Linear_Priority_Mapping.h" -#include "tao/RTCORBA/Direct_Priority_Mapping.h" -#include "tao/RTCORBA/Linear_Network_Priority_Mapping.h" -#include "tao/RTCORBA/RT_ORB.h" -#include "tao/RTCORBA/RT_Current.h" -#include "tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h" +#include "RT_Policy_i.h" +#include "RT_PolicyFactory.h" +#include "RT_Protocols_Hooks.h" +#include "Priority_Mapping_Manager.h" +#include "Network_Priority_Mapping_Manager.h" +#include "RT_ORB_Loader.h" +#include "RT_Stub_Factory.h" +#include "RT_Endpoint_Selector_Factory.h" +#include "Continuous_Priority_Mapping.h" +#include "Linear_Priority_Mapping.h" +#include "Direct_Priority_Mapping.h" +#include "Linear_Network_Priority_Mapping.h" +#include "RT_ORB.h" +#include "RT_Current.h" +#include "RT_Thread_Lane_Resources_Manager.h" #include "tao/Exception.h" #include "tao/ORB_Core.h" @@ -36,28 +36,24 @@ ACE_RCSID (RTCORBA, #include "ace/Svc_Conf.h" #include "ace/Sched_Params.h" -static const char rt_poa_factory_name[] = "TAO_RT_Object_Adapter_Factory"; -static const ACE_TCHAR rt_poa_factory_directive[] = +static const char *rt_poa_factory_name = "TAO_RT_Object_Adapter_Factory"; +static const ACE_TCHAR *rt_poa_factory_directive = ACE_DYNAMIC_SERVICE_DIRECTIVE( "TAO_RT_Object_Adapter_Factory", "TAO_RTPortableServer", "_make_TAO_RT_Object_Adapter_Factory", ""); -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO_RT_ORBInitializer::TAO_RT_ORBInitializer (int priority_mapping_type, int network_priority_mapping_type, int ace_sched_policy, long sched_policy, - long scope_policy, - ACE_Time_Value const &dynamic_thread_idle_timeout) + long scope_policy) : priority_mapping_type_ (priority_mapping_type), network_priority_mapping_type_ (network_priority_mapping_type), ace_sched_policy_ (ace_sched_policy), sched_policy_ (sched_policy), - scope_policy_ (scope_policy), - dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout) + scope_policy_ (scope_policy) { } @@ -89,7 +85,7 @@ TAO_RT_ORBInitializer::pre_init ( // If the application resolves the root POA, make sure we load the RT POA. TAO_ORB_Core::set_poa_factory (rt_poa_factory_name, - ACE_TEXT_ALWAYS_CHAR (rt_poa_factory_directive)); + ACE_TEXT_TO_CHAR_IN (rt_poa_factory_directive)); // Create the initial priority mapping instance. TAO_Priority_Mapping *pm = 0; @@ -122,6 +118,7 @@ TAO_RT_ORBInitializer::pre_init ( CORBA::COMPLETED_NO)); ACE_CHECK; + TAO_Priority_Mapping_Manager_var safe_manager = manager; info->register_initial_reference ("PriorityMappingManager", @@ -187,8 +184,7 @@ TAO_RT_ORBInitializer::pre_init ( // Create the RT_ORB. CORBA::Object_ptr rt_orb = CORBA::Object::_nil (); ACE_NEW_THROW_EX (rt_orb, - TAO_RT_ORB (tao_info->orb_core (), - dynamic_thread_idle_timeout_), + TAO_RT_ORB (tao_info->orb_core ()), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( TAO::VMCID, @@ -261,7 +257,7 @@ TAO_RT_ORBInitializer::register_policy_factories ( // Bind the same policy factory to all RTCORBA related policy // types since a single policy factory is used to create each of // the different types of RTCORBA policies. - static CORBA::PolicyType const type[] = { + CORBA::PolicyType type[] = { RTCORBA::PRIORITY_MODEL_POLICY_TYPE, RTCORBA::THREADPOOL_POLICY_TYPE, RTCORBA::SERVER_PROTOCOL_POLICY_TYPE, @@ -273,7 +269,7 @@ TAO_RT_ORBInitializer::register_policy_factories ( const CORBA::PolicyType *end = type + sizeof (type) / sizeof (type[0]); - for (CORBA::PolicyType const * i = type; + for (CORBA::PolicyType *i = type; i != end; ++i) { @@ -307,6 +303,4 @@ TAO_RT_ORBInitializer::register_policy_factories ( } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ |