diff options
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp | 31 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp | 13 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/lib/Driver.cpp | 100 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Event/lib/Driver.h | 15 |
7 files changed, 5 insertions, 172 deletions
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp index 45f125d5136..ec523388f64 100644 --- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp +++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp @@ -9,8 +9,8 @@ #include "orbsvcs/CosNamingC.h" #include "orbsvcs/Scheduler_Factory.h" -ACE_RCSID (Dump_Schedule, - Dump_Schedule, +ACE_RCSID (Dump_Schedule, + Dump_Schedule, "$Id$") // This program dumps the results of one scheduling in a C++ file. @@ -53,38 +53,13 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[]) RtecScheduler::Config_Info_Set_var configs; RtecScheduler::Scheduling_Anomaly_Set_var anomalies; -#if defined (__SUNPRO_CC) - // Sun C++ 4.2 warns with the code below: - // Warning (Anachronism): Temporary used for non-const - // reference, now obsolete. - // Note: Type "CC -migration" for more on anachronisms. - // Warning (Anachronism): The copy constructor for argument - // infos of type RtecScheduler::RT_Info_Set_out should take - // const RtecScheduler::RT_Info_Set_out&. - // But, this code is not CORBA conformant, because users should - // not define instances of _out types. - - RtecScheduler::RT_Info_Set_out infos_out (infos); - RtecScheduler::Dependency_Set_out deps_out (deps); - RtecScheduler::Config_Info_Set_out configs_out (configs); - RtecScheduler::Scheduling_Anomaly_Set_out anomalies_out (anomalies); - ACE_Scheduler_Factory::server ()->compute_scheduling - (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, - ACE_SCOPE_THREAD), - ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, - ACE_SCOPE_THREAD), - infos_out, deps_out, configs_out, anomalies_out - ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check -#else /* ! __SUNPRO_CC */ ACE_Scheduler_Factory::server ()->compute_scheduling (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), infos.out (), deps.out (), configs.out (), anomalies.out () - ACE_ENV_ARG_PARAMETER); // FUZZ: ignore check_for_ace_check -#endif /* ! __SUNPRO_CC */ - + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Scheduler_Factory::dump_schedule (infos.in (), diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp index 8b60e9def69..47d53b16744 100644 --- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp @@ -101,18 +101,6 @@ main (int argc, char* argv[]) ACE_TRY_CHECK; // **************************************************************** -#if 0 - // Create an event channel implementation... - TAO_Default_Module_Factory module_factory; - ACE_EventChannel ec_impl (scheduler.in (), - 1, - ACE_DEFAULT_EVENT_CHANNEL_TYPE, - &module_factory); - - RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; -#else TAO_EC_Event_Channel_Attributes attributes (poa.in (), poa.in ()); attributes.scheduler = scheduler.in (); // no need to dup @@ -121,7 +109,6 @@ main (int argc, char* argv[]) RtecEventChannelAdmin::EventChannel_var event_channel = ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; -#endif // **************************************************************** // Create a consumer, intialize its RT_Info structures, and diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp index 896a59be724..465baff19f6 100644 --- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp @@ -111,19 +111,6 @@ main (int argc, char* argv[]) // **************************************************************** -#if 0 - // Create an event channel implementation... - TAO_Default_Module_Factory module_factory; - ACE_EventChannel event_channel_impl (scheduler.in (), - 1, - ACE_DEFAULT_EVENT_CHANNEL_TYPE, - &module_factory); - - RtecEventChannelAdmin::EventChannel_var event_channel = - event_channel_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; -#else - TAO_EC_Event_Channel_Attributes attributes (poa.in (), poa.in ()); attributes.scheduler = scheduler.in (); // no need to dup @@ -137,7 +124,6 @@ main (int argc, char* argv[]) RtecEventChannelAdmin::EventChannel_var event_channel = ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; -#endif /* 0 */ // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp index 3766c63094f..655e6389a7e 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp @@ -11,8 +11,6 @@ #include "orbsvcs/Event/EC_ConsumerAdmin.h" #include "orbsvcs/Event_Utilities.h" #include "orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/Event/Module_Factory.h" -#include "orbsvcs/Event/Event_Channel.h" #include "orbsvcs/Event/EC_Default_Factory.h" #include "orbsvcs/Event/EC_Event_Channel.h" diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc index 3f21416f2b1..a8dd5d1ba22 100644 --- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(RTEventLogAdmin) : orbsvcslib, core, naming, rtoldevent, dslogadmin_serv { +project(RTEventLogAdmin) : orbsvcslib, core, naming, rtevent, rtsched, dslogadmin_serv { sharedname = TAO_RTEventLogAdmin idlflags += -Wb,export_macro=TAO_RTEventLog_Export -Wb,export_include=orbsvcs/Log/rteventlog_export.h dynamicflags = TAO_RTEVENTLOG_BUILD_DLL diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index b06fe26b585..d74d6f76b84 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -49,10 +49,6 @@ EC_Driver::EC_Driver (void) thr_create_flags_ (THR_NEW_LWP|THR_BOUND|THR_SCHED_FIFO), use_remote_ec_ (0), event_service_name_ ("EventService"), - use_old_ec_ (0), -#if !defined(TAO_EC_DISABLE_OLD_EC) - module_factory_ (0), -#endif ec_impl_ (0) { TAO_EC_Default_Factory::init_svcs (); @@ -287,15 +283,6 @@ EC_Driver::initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL) } #endif -#if !defined(EC_DISABLE_OLD_EC) - if (this->use_old_ec_ == 1) - { - this->initialize_old_ec (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - return; - } -#endif - this->initialize_new_ec (ACE_ENV_SINGLE_ARG_PARAMETER); } @@ -336,64 +323,6 @@ EC_Driver::get_naming_context (ACE_ENV_SINGLE_ARG_DECL) } #endif -#if !defined(EC_DISABLE_OLD_EC) -int -EC_Driver::initialize_old_ec (ACE_ENV_SINGLE_ARG_DECL) -{ - CosNaming::NamingContext_var naming_context = - this->get_naming_context (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - // This is the name we (potentially) register the Scheduling - // Service in the Naming Service. - CosNaming::Name schedule_name (1); - schedule_name.length (1); - schedule_name[0].id = CORBA::string_dup ("ScheduleService"); - - if (this->use_runtime_scheduler_ == 1) - ACE_NEW (this->scheduler_impl_, - ACE_Runtime_Scheduler (runtime_configs_size, - runtime_configs, - runtime_infos_size, - runtime_infos)); - else - ACE_NEW (this->scheduler_impl_, - ACE_Config_Scheduler ()); - - - this->scheduler_ = - this->scheduler_impl_._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - - CORBA::String_var str = - this->orb_->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - ACE_DEBUG ((LM_DEBUG, - "EC_Driver (%P|%t) The (local) scheduler IOR is <%s>\n", - str.in ())); - - - if (this->reactive_ec_ == 1) - ACE_NEW_RETURN (this->module_factory_, - TAO_Reactive_Module_Factory, - -1); - else - ACE_NEW_RETURN (this->module_factory_, - TAO_Default_Module_Factory, - -1); - - ACE_NEW_RETURN (this->ec_impl_, - ACE_EventChannel (scheduler.in (), 1, - ACE_DEFAULT_EVENT_CHANNEL_TYPE, - this->module_factory_), - -1); - - this->event_channel_ = - this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); -} -#endif /* */ - void EC_Driver::initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL) { @@ -437,23 +366,6 @@ EC_Driver::deactivate_ec (ACE_ENV_SINGLE_ARG_DECL) if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) EC deactivated\n")); -#if !defined(EC_DISABLE_OLD_EC) - if (this->use_old_ec_ == 1) - { - // Deactivate the Scheduler - PortableServer::POA_var poa = - scheduler_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - PortableServer::ObjectId_var id = - poa->servant_to_id (&scheduler_impl ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - - if (this->verbose ()) - ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) scheduler deactivated\n")); - } -#endif } void @@ -841,18 +753,6 @@ EC_Driver::parse_args (int &argc, char *argv []) } } - else if (ACE_OS::strcmp (arg, "-old_reactive") == 0) - { - arg_shifter.consume_arg (); - this->use_old_ec_ = 1; - } - - else if (ACE_OS::strcmp (arg, "-old_threaded") == 0) - { - arg_shifter.consume_arg (); - this->use_old_ec_ = 1; - } - else if (ACE_OS::strcmp (arg, "-suppliers") == 0) { arg_shifter.consume_arg (); diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index c902b4a7052..4ff4a1cffbe 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.h +++ b/TAO/orbsvcs/tests/Event/lib/Driver.h @@ -201,12 +201,7 @@ public: get_naming_context (ACE_ENV_SINGLE_ARG_DECL); #endif -#if !defined(EC_DISABLE_OLD_EC) - /// Initialize the EC using the old implementation - virtual void initialize_old_ec (ACE_ENV_SINGLE_ARG_DECL); -#endif - - /// Initialize the EC using the old implementation + /// Initialize the EC using the new implementation virtual void initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL); /// Allocate the suppliers and the consumers @@ -316,14 +311,6 @@ protected: /// The name of the remote event service const char* event_service_name_; - /// Use the old implementation of the event channel. - int use_old_ec_; - -#if !defined(TAO_EC_DISABLE_OLD_EC) - /// The module factory for the OLD ec - TAO_Module_Factory* module_factory_; -#endif - /// The event channel implementation POA_RtecEventChannelAdmin::EventChannel *ec_impl_; |