diff options
Diffstat (limited to 'TAO/tao/default_resource.cpp')
| -rw-r--r-- | TAO/tao/default_resource.cpp | 145 |
1 files changed, 9 insertions, 136 deletions
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index f1268b361b5..39bf21cf16e 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -9,9 +9,6 @@ #include "tao/UIOP_Factory.h" #include "tao/Acceptor_Registry.h" #include "tao/Connector_Registry.h" -#include "tao/Single_Reactor.h" -#include "tao/Reactor_Per_Priority.h" -#include "tao/Priority_Mapping.h" #include "ace/Select_Reactor.h" #include "ace/FlReactor.h" @@ -30,14 +27,11 @@ ACE_RCSID(tao, default_resource, "$Id$") TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void) : use_tss_resources_ (0), use_locked_data_blocks_ (1), - reactor_registry_type_ (TAO_SINGLE_REACTOR), reactor_type_ (TAO_REACTOR_SELECT_MT), cdr_allocator_type_ (TAO_ALLOCATOR_THREAD_LOCK), protocol_factories_ (), connection_caching_type_ (TAO_CONNECTION_CACHING_STRATEGY), - purge_percentage_ (TAO_PURGE_PERCENT), - reactor_mask_signals_ (1), - sched_policy_ (ACE_SCHED_OTHER) + purge_percentage_ (TAO_PURGE_PERCENT) { } @@ -76,7 +70,6 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->use_tss_resources_ = 1; } } - else if (ACE_OS::strcasecmp (argv[curarg], "-ORBReactorLock") == 0) { @@ -96,42 +89,6 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) } else if (ACE_OS::strcasecmp (argv[curarg], - "-ORBReactorMaskSignals") == 0) - { - curarg++; - if (curarg < argc) - { - char *name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, "0") == 0) - this->reactor_mask_signals_ = 0; - else if (ACE_OS::strcasecmp (name, "1") == 0) - this->reactor_mask_signals_= 1; - } - } - - else if (ACE_OS::strcasecmp (argv[curarg], - "-ORBReactorRegistry") == 0) - { - curarg++; - if (curarg < argc) - { - char *name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, - "single") == 0) - this->reactor_registry_type_ = TAO_SINGLE_REACTOR; - else if (ACE_OS::strcasecmp (name, - "per-priority") == 0) - this->reactor_registry_type_ = TAO_REACTOR_PER_PRIORITY; - else - ACE_DEBUG ((LM_DEBUG, - "TAO_Default_Factory - unknown argument" - " <%s> for -ORBReactorRegistry\n", name)); - } - } - - else if (ACE_OS::strcasecmp (argv[curarg], "-ORBReactorType") == 0) { curarg++; @@ -263,30 +220,6 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) "for -ORBPurgePercentage\n")); } - else if (ACE_OS::strcasecmp (argv[curarg], - "-ORBSchedPolicy") == 0) - { - curarg++; - if (curarg < argc) - { - char *name = argv[curarg]; - - if (ACE_OS::strcasecmp (name, - "SCHED_OTHER") == 0) - this->sched_policy_ = ACE_SCHED_OTHER; - else if (ACE_OS::strcasecmp (name, - "SCHED_FIFO") == 0) - this->sched_policy_ = ACE_SCHED_FIFO; - else if (ACE_OS::strcasecmp (name, - "SCHED_RR") == 0) - this->sched_policy_ = ACE_SCHED_RR; - else - ACE_DEBUG ((LM_DEBUG, - "TAO_Default_Factory - unknown argument" - " <%s> for -ORBSchedPolicy\n", name)); - } - } - return 0; } @@ -422,49 +355,18 @@ TAO_Default_Resource_Factory::get_protocol_factories (void) TAO_Acceptor_Registry* TAO_Default_Resource_Factory::get_acceptor_registry (void) { - TAO_Acceptor_Registry *ar = 0; - - ACE_NEW_RETURN(ar, - TAO_Acceptor_Registry, - 0); - - return ar; + return new TAO_Acceptor_Registry; } TAO_Connector_Registry* TAO_Default_Resource_Factory::get_connector_registry (void) { - TAO_Connector_Registry *cr = 0; - - ACE_NEW_RETURN(cr, - TAO_Connector_Registry, - 0); - - return cr; + return new TAO_Connector_Registry; } -TAO_Reactor_Registry * -TAO_Default_Resource_Factory::get_reactor_registry (void) -{ - TAO_Reactor_Registry *reactor_registry = 0; - switch (this->reactor_registry_type_) - { - default: - case TAO_SINGLE_REACTOR: - ACE_NEW_RETURN (reactor_registry, - TAO_Single_Reactor, - 0); - break; - - case TAO_REACTOR_PER_PRIORITY: - ACE_NEW_RETURN (reactor_registry, - TAO_Reactor_Per_Priority, - 0); - break; - } - - return reactor_registry; -} +// @@ TODO We may be changing the state of the global +// Allocated_Resources structure, but without any locks? +// It seems to be done all over the place. ACE_Reactor_Impl* TAO_Default_Resource_Factory::allocate_reactor_impl (void) const @@ -474,23 +376,11 @@ TAO_Default_Resource_Factory::allocate_reactor_impl (void) const { default: case TAO_REACTOR_SELECT_MT: - ACE_NEW_RETURN (impl, - TAO_REACTOR ((ACE_Sig_Handler*)0, - (ACE_Timer_Queue*)0, - 0, - (ACE_Reactor_Notify*)0, - this->reactor_mask_signals_), - 0); + ACE_NEW_RETURN (impl, TAO_REACTOR, 0); break; case TAO_REACTOR_SELECT_ST: - ACE_NEW_RETURN (impl, - TAO_NULL_LOCK_REACTOR ((ACE_Sig_Handler*)0, - (ACE_Timer_Queue*)0, - 0, - (ACE_Reactor_Notify*)0, - this->reactor_mask_signals_), - 0); + ACE_NEW_RETURN (impl, TAO_NULL_LOCK_REACTOR, 0); break; case TAO_REACTOR_FL: @@ -512,10 +402,7 @@ TAO_Default_Resource_Factory::allocate_reactor_impl (void) const break; case TAO_REACTOR_TP: - ACE_NEW_RETURN (impl, ACE_TP_Reactor ((ACE_Sig_Handler*)0, - (ACE_Timer_Queue*)0, - this->reactor_mask_signals_), - 0); + ACE_NEW_RETURN (impl, ACE_TP_Reactor, 0); break; } return impl; @@ -620,20 +507,6 @@ TAO_Default_Resource_Factory::purge_percentage (void) const return this->purge_percentage_; } -TAO_Priority_Mapping * -TAO_Default_Resource_Factory::get_priority_mapping (void) -{ -#if !defined (TAO_HAS_RT_CORBA) - return 0; -#else - TAO_Priority_Mapping *pm; - ACE_NEW_RETURN (pm, - TAO_Priority_Mapping (this->sched_policy_), - 0); - return pm; -#endif /* TAO_HAS_RT_CORBA */ -} - // **************************************************************** ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory, |