diff options
Diffstat (limited to 'TAO/examples/RTScheduling')
18 files changed, 88 insertions, 201 deletions
diff --git a/TAO/examples/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp index a0ae68a61ce..37caa034f69 100644 --- a/TAO/examples/RTScheduling/DT_Creator.cpp +++ b/TAO/examples/RTScheduling/DT_Creator.cpp @@ -172,7 +172,7 @@ DT_Creator::init (int argc, char *argv []) } void -DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL) +DT_Creator::register_synch_obj (void) { CosNaming::Name name (1); name.length (1); @@ -187,7 +187,6 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL) synch_context = this->naming_->bind_new_context (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // // We reach here if there was no exception raised in @@ -209,13 +208,11 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var object = this->naming_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; synch_context = CosNaming::NamingContext::_narrow (object.in ()); } ACE_ENDTRY; - ACE_CHECK; ACE_CString synch_name ("Synch"); ACE_Time_Value timestamp = ACE_OS::gettimeofday (); @@ -233,43 +230,37 @@ DT_Creator::register_synch_obj (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW (synch_, Synch_i); - Synch_var synch = synch_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + Synch_var synch = synch_->_this (); // Register the synch object with the Synch context. synch_context->rebind (name, synch.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } int -DT_Creator::activate_root_poa (ACE_ENV_SINGLE_ARG_DECL) +DT_Creator::activate_root_poa (void) { CORBA::Object_var object = orb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); root_poa_ = PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); PortableServer::POAManager_var poa_manager = - root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + root_poa_->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + poa_manager->activate (); return 0; } void -DT_Creator::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL) +DT_Creator::activate_poa_list (void) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -280,24 +271,21 @@ DT_Creator::activate_poa_list (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var object = orb_->resolve_initial_references ("RTORB" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->rt_orb_ = RTCORBA::RTORB::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } for (int i = 0; i < poa_count_; ++i) { poa_list_[i]->activate (this->rt_orb_.in(), this->root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } void -DT_Creator::activate_job_list (ACE_ENV_SINGLE_ARG_DECL) +DT_Creator::activate_job_list (void) { if (TAO_debug_level > 0) @@ -317,7 +305,6 @@ DT_Creator::activate_job_list (ACE_ENV_SINGLE_ARG_DECL) PortableServer::POA_var host_poa = root_poa_->find_POA (job->poa ().c_str (), 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableServer::ServantBase_var servant_var (job); @@ -326,29 +313,24 @@ DT_Creator::activate_job_list (ACE_ENV_SINGLE_ARG_DECL) id = host_poa->activate_object (job ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Object_var server = host_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var ior = orb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const ACE_CString &job_name = job->name (); CosNaming::Name_var name = this->naming_->to_name (job_name.c_str () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->naming_->rebind (name.in (), server.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } /* while */ @@ -358,7 +340,7 @@ DT_Creator::activate_job_list (ACE_ENV_SINGLE_ARG_DECL) } void -DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL) +DT_Creator::activate_schedule (void) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -380,10 +362,8 @@ DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; Job_var job = Job::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // if (TAO_debug_level > 0) // { @@ -392,12 +372,10 @@ DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL) CORBA::Policy_var policy = job->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE ACE_ENV_ARG_PARAMETER); - ACE_CHECK; RTCORBA::PriorityModelPolicy_var priority_policy = RTCORBA::PriorityModelPolicy::_narrow (policy.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (priority_policy.in ())) ACE_DEBUG ((LM_DEBUG, @@ -406,8 +384,7 @@ DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL) { /* RTCORBA::PriorityModel priority_model = - priority_policy->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + priority_policy->priority_model (); if (priority_model == RTCORBA::CLIENT_PROPAGATED) ACE_DEBUG ((LM_DEBUG, @@ -430,12 +407,11 @@ DT_Creator::activate_schedule (ACE_ENV_SINGLE_ARG_DECL) } int -DT_Creator::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) +DT_Creator::resolve_naming_service (void) { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); // Need to check return value for errors. if (CORBA::is_nil (naming_obj.in ())) @@ -446,7 +422,6 @@ DT_Creator::resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL) this->naming_ = CosNaming::NamingContextExt::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); //@@tmp hack, otherwise crashes on exit!..?? CosNaming::NamingContextExt::_duplicate (this->naming_.in()); @@ -470,8 +445,7 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current while (!this->synch ()->synched ()) { - this->orb_->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->orb_->perform_work (); } CORBA::Policy_var sched_param; @@ -481,7 +455,6 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current sched_param.in (), sched_param.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW (base_time_, ACE_Time_Value (*(this->synch ()->base_time ()))); @@ -519,7 +492,6 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current flags, base_time_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -527,7 +499,6 @@ DT_Creator::create_distributable_threads (RTScheduling::Current_ptr current current_->end_scheduling_segment (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->check_ifexit (); } diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h index 106f4221307..8516818c75d 100644 --- a/TAO/examples/RTScheduling/DT_Creator.h +++ b/TAO/examples/RTScheduling/DT_Creator.h @@ -36,9 +36,9 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object virtual void create_distributable_threads (RTScheduling::Current_ptr current ACE_ENV_ARG_DECL_WITH_DEFAULTS); - void activate_poa_list (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - void activate_job_list (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - void activate_schedule (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void activate_poa_list (void); + void activate_job_list (void); + void activate_schedule (void); virtual void yield (int suspend_time, Thread_Task* task) = 0; @@ -56,7 +56,7 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object // virtual Task* task (void) = 0; /// Resolve the naming service. - int resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL); + int resolve_naming_service (void); int dt_count (void); @@ -81,9 +81,9 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object Synch_i* synch (void); - void register_synch_obj (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void register_synch_obj (void); - int activate_root_poa (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int activate_root_poa (void); protected: diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp index 5019ee6ae5d..82651126597 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp @@ -8,7 +8,7 @@ ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter; RTCORBA::Priority -Segment_Sched_Param_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Segment_Sched_Param_Policy::value (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; @@ -23,23 +23,21 @@ Segment_Sched_Param_Policy::value (RTCORBA::Priority value } CORBA::Policy_ptr -Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) +Segment_Sched_Param_Policy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { Segment_Sched_Param_Policy *copy = 0; ACE_NEW_THROW_EX (copy, Segment_Sched_Param_Policy, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); copy->value (this->value_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return copy; } void -Segment_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Segment_Sched_Param_Policy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -51,11 +49,9 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (CORBA::ORB_ptr orb) CORBA::Object_var object = orb->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->current_ = RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -115,7 +111,6 @@ Fixed_Priority_Scheduler::begin_nested_scheduling_segment (const RTScheduling::C sched_param, implicit_sched_param ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -132,7 +127,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current sched_param, implicit_sched_param ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -178,13 +172,11 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p srv_con->context_id = Client_Interceptor::SchedulingInfo; srv_con->context_data.length (sizeof (size_t)); ACE_OS::memcpy (srv_con->context_data.get_buffer (), - current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (), + current_->id ()->get_buffer (), sizeof (size_t)); - ACE_CHECK; request_info->add_request_service_context (*srv_con, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -201,7 +193,6 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf IOP::ServiceContext* serv_cxt = request_info->get_request_service_context (Server_Interceptor::SchedulingInfo ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (serv_cxt != 0) { @@ -302,7 +293,7 @@ Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType & } CORBA::PolicyList* -Fixed_Priority_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Fixed_Priority_Scheduler::scheduling_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -316,14 +307,14 @@ Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList & } CORBA::PolicyList* -Fixed_Priority_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Fixed_Priority_Scheduler::poa_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } char * -Fixed_Priority_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Fixed_Priority_Scheduler::scheduling_discipline_name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h index 3c689613388..c7fb3ca7488 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h @@ -12,17 +12,17 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy, public TAO_Local_RefCounted_Object { public: - virtual RTCORBA::Priority value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual RTCORBA::Priority value (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void value (RTCORBA::Priority value ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -130,17 +130,17 @@ public TAO_Local_RefCounted_Object ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyList * scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyList * scheduling_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyList * poa_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyList * poa_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * scheduling_discipline_name (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp index 6f78d4353bd..cae94324334 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Task.cpp @@ -45,7 +45,6 @@ FP_Task::activate_task (RTScheduling::Current_ptr current, current_ = RTScheduling::Current::_narrow (current ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); sched_param_ = CORBA::Policy::_duplicate (sched_param); @@ -72,12 +71,10 @@ FP_Task::pre_activate (void) { CORBA::Object_var object = DT_TEST::instance ()->orb ()->resolve_initial_references ("PriorityMappingManager" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var mapping_manager = RTCORBA::PriorityMappingManager::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RTCORBA::PriorityMapping *pm = mapping_manager->mapping (); diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp index 2d328877266..e6e0cbf7785 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp @@ -71,7 +71,6 @@ DT_Test::init (int argc, char *argv [] argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); this->check_supported_priorities (); @@ -81,11 +80,9 @@ DT_Test::init (int argc, char *argv [] CORBA::Object_ptr manager_obj = orb_->resolve_initial_references ("RTSchedulerManager" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (scheduler_, @@ -97,11 +94,9 @@ DT_Test::init (int argc, char *argv [] CORBA::Object_var object = orb_->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); current_ = RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); if (sched_policy_ != ACE_SCHED_OTHER) @@ -133,29 +128,22 @@ DT_Test::run (int argc, char* argv [] { init (argc,argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - if (this->dt_creator_->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->dt_creator_->resolve_naming_service () == -1) return; - ACE_CHECK; //TASK_STATS::instance ()->init (this->dt_creator_->dt_count () * 100); - this->dt_creator_->activate_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->dt_creator_->activate_root_poa (); - this->dt_creator_->activate_poa_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->dt_creator_->activate_job_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->dt_creator_->activate_schedule (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->dt_creator_->activate_poa_list (); + this->dt_creator_->activate_job_list (); + this->dt_creator_->activate_schedule (); DT_Creator* dt_creator = this->dt_creator_; - dt_creator->register_synch_obj (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + dt_creator->register_synch_obj (); ACE_DEBUG ((LM_DEBUG, "Registered Synch Object\n")); @@ -163,7 +151,6 @@ DT_Test::run (int argc, char* argv [] /* dt_creator_->create_distributable_threads (current_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; */ this->activate_task (); @@ -173,8 +160,7 @@ DT_Test::run (int argc, char* argv [] dt_creator_->log_msg (msg); //ACE_Thread_Manager::instance ()->wait (); - orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + orb_->run (); } @@ -236,7 +222,6 @@ DT_Test::svc (void) dt_creator_->create_distributable_threads (current_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } @@ -267,7 +252,6 @@ main (int argc, char* argv []) DT_TEST::instance ()->run (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h index 70e043e4f21..a2615d3b23a 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h @@ -16,15 +16,15 @@ class Task_Stats; class DT_Test :public ACE_Task <ACE_SYNCH> { public: - + DT_Test (void); - + void check_supported_priorities (void); - + int init (int argc, char *argv [] ACE_ENV_ARG_DECL_WITH_DEFAULTS); - void run (int argc, char *argv [] + void run (int argc, char *argv [] ACE_ENV_ARG_DECL_WITH_DEFAULTS); void dt_creator (FP_DT_Creator* dt_creator); @@ -37,15 +37,15 @@ class DT_Test :public ACE_Task <ACE_SYNCH> CORBA::ORB_ptr orb (void); ACE_hrtime_t base_t; - - void register_synch_obj (ACE_ENV_SINGLE_ARG_DECL); + + void register_synch_obj (void); protected: /// task svc virtual int svc (void); - + private: /// = Policies long thr_sched_policy_; @@ -54,13 +54,13 @@ class DT_Test :public ACE_Task <ACE_SYNCH> CORBA::ORB_var orb_; int max_priority_; int min_priority_; - RTScheduling::Current_var current_; + RTScheduling::Current_var current_; FP_DT_Creator* dt_creator_; Fixed_Priority_Scheduler* scheduler_; RTCORBA::RTORB_var rt_orb_; /// Reference to the root poa. PortableServer::POA_var root_poa_; - + }; typedef ACE_Singleton <DT_Test, TAO_SYNCH_MUTEX> DT_TEST; diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp index 00a5c022d0e..9075a872a62 100644 --- a/TAO/examples/RTScheduling/Job_i.cpp +++ b/TAO/examples/RTScheduling/Job_i.cpp @@ -65,8 +65,8 @@ Job_i::work (CORBA::ULong work, if (guid_ == 0) ACE_OS::memcpy (&guid_, - dt_creator_->current ()->id (ACE_ENV_SINGLE_ARG_PARAMETER)->get_buffer (), - sizeof (dt_creator_->current ()->id (ACE_ENV_SINGLE_ARG_PARAMETER)->length ())); + dt_creator_->current ()->id ()->get_buffer (), + sizeof (dt_creator_->current ()->id ()->length ())); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -110,7 +110,6 @@ Job_i::work (CORBA::ULong work, sched_param.in (), sched_param.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -127,7 +126,7 @@ Job_i::guid (void) } void -Job_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Job_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { dt_creator_->job_ended (); diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h index 219c5908f33..a38e7061d55 100644 --- a/TAO/examples/RTScheduling/Job_i.h +++ b/TAO/examples/RTScheduling/Job_i.h @@ -56,7 +56,7 @@ class RTSCHEDTESTLIB_Export Job_i : public POA_Job void dump_stats (void); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC (( CORBA::SystemException )); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp index 6c02c305435..59332fb7de1 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp @@ -55,7 +55,6 @@ MIF_DT_Creator::yield (int suspend_time, sched_param.in (), sched_param.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; now = ACE_OS::gettimeofday (); if (suspend_time == 1) break; diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp index f692891e326..373f16b138b 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp @@ -31,7 +31,7 @@ DT::resume (void) } CORBA::Short -Segment_Sched_Param_Policy::importance (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Segment_Sched_Param_Policy::importance (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->importance_; @@ -46,23 +46,21 @@ Segment_Sched_Param_Policy::importance (CORBA::Short importance } CORBA::Policy_ptr -Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL) +Segment_Sched_Param_Policy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { Segment_Sched_Param_Policy *copy = 0; ACE_NEW_THROW_EX (copy, Segment_Sched_Param_Policy, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); copy->importance (this->importance_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return copy; } void -Segment_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Segment_Sched_Param_Policy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -76,11 +74,9 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb) CORBA::Object_var object = orb->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; this->current_ = RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; wait_ = 0; } @@ -163,8 +159,7 @@ MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param = MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (sched_policy); - CORBA::Short desired_priority = sched_param->importance (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Short desired_priority = sched_param->importance (); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -203,7 +198,6 @@ MIF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT sched_param, implicit_sched_param ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -223,7 +217,7 @@ MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &/ MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param = MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (sched_policy); - CORBA::Short desired_priority = sched_param->importance (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::Short desired_priority = sched_param->importance (); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -303,16 +297,14 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_ PortableInterceptor::ForwardRequest)) { MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var = - MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ()); IOP::ServiceContext* srv_con = new IOP::ServiceContext; srv_con->context_id = Client_Interceptor::SchedulingInfo; - int guid_length = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER)->length (); - ACE_CHECK; + int guid_length = current_->id ()->length (); - RTScheduling::Current::IdType* guid = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER); + RTScheduling::Current::IdType* guid = current_->id (); CORBA::Octet *seq_buf = CORBA::OctetSeq::allocbuf (guid_length); ACE_OS::memcpy (seq_buf, @@ -343,7 +335,6 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_ request_info->add_request_service_context (*srv_con, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; lock_.acquire (); if (ready_que_.message_count () > 0) @@ -361,7 +352,6 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_ current_->the_priority (priority + 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_Thread::self (current); if (ACE_Thread::getprio (current, priority) == -1) @@ -464,8 +454,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ACE_THROW_SPEC ((CORBA::SystemException)) { - RTScheduling::Current::IdType* guid = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + RTScheduling::Current::IdType* guid = current_->id (); size_t count; ACE_OS::memcpy (&count, @@ -514,8 +503,7 @@ MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr { if (TAO_debug_level > 0) { - RTScheduling::Current::IdType* guid = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + RTScheduling::Current::IdType* guid = current_->id (); size_t count; ACE_OS::memcpy (&count, @@ -555,8 +543,7 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr { MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var = - MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ()); int importance = sched_param_var->importance (); CORBA::Octet *int_buf = CORBA::OctetSeq::allocbuf (sizeof (importance)); @@ -564,7 +551,7 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr &importance, sizeof (importance)); - RTScheduling::Current::IdType* guid = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER); + RTScheduling::Current::IdType* guid = current_->id (); size_t gu_id; ACE_OS::memcpy (&gu_id, @@ -595,7 +582,6 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr current_->the_priority (priority - 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; new_dt->suspend (); lock_.release (); } @@ -607,8 +593,7 @@ MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ForwardRequest)) { MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var = - MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ()); int importance = sched_param_var->importance (); CORBA::Octet *int_buf = CORBA::OctetSeq::allocbuf (sizeof (importance)); @@ -616,7 +601,7 @@ MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr &importance, sizeof (importance)); - RTScheduling::Current::IdType* guid = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER); + RTScheduling::Current::IdType* guid = current_->id (); size_t gu_id; ACE_OS::memcpy (&gu_id, @@ -641,7 +626,6 @@ MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr current_->the_priority (priority - 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; new_dt->suspend (); lock_.release (); } @@ -653,8 +637,7 @@ MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr PortableInterceptor::ForwardRequest)) { MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var = - MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_CHECK; + MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ()); int importance = sched_param_var->importance (); CORBA::Octet *int_buf = CORBA::OctetSeq::allocbuf (sizeof (importance)); @@ -662,7 +645,7 @@ MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr &importance, sizeof (importance)); - RTScheduling::Current::IdType* guid = current_->id (ACE_ENV_SINGLE_ARG_PARAMETER); + RTScheduling::Current::IdType* guid = current_->id (); size_t gu_id; ACE_OS::memcpy (&gu_id, @@ -687,7 +670,6 @@ MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr current_->the_priority (priority - 1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; new_dt->suspend (); lock_.release (); } @@ -700,7 +682,7 @@ MIF_Scheduler::cancel (const RTScheduling::Current::IdType & } CORBA::PolicyList* -MIF_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +MIF_Scheduler::scheduling_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; @@ -714,14 +696,14 @@ MIF_Scheduler::scheduling_policies (const CORBA::PolicyList & } CORBA::PolicyList* -MIF_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +MIF_Scheduler::poa_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } char * -MIF_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +MIF_Scheduler::scheduling_discipline_name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h index c388b0f58d6..159180b2ef1 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h @@ -34,17 +34,17 @@ public MIF_Scheduling::SegmentSchedulingParameterPolicy, public TAO_Local_RefCounted_Object { public: - virtual CORBA::Short importance (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual CORBA::Short importance (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void importance (CORBA::Short importance ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -161,17 +161,17 @@ public TAO_Local_RefCounted_Object ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyList * scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyList * scheduling_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyList * poa_policies (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::PolicyList * poa_policies (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual char * scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * scheduling_discipline_name (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp index d504fd941f5..e89882f64b5 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp @@ -66,7 +66,6 @@ MIF_Task::activate_task (RTScheduling::Current_ptr current, current_ = RTScheduling::Current::_narrow (current ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); sched_param_ = CORBA::Policy::_duplicate (sched_param); @@ -125,7 +124,6 @@ MIF_Task::perform_task (void) sched_param.in (), sched_param.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } if (this->dist_) @@ -154,7 +152,6 @@ MIF_Task::perform_task (void) sched_param.in (), sched_param.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp index f290a52e718..f5a253138dd 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp @@ -22,17 +22,14 @@ DT_Test::init (int argc, char *argv [] argv, "" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); dt_creator_->orb (orb_.in ()); CORBA::Object_ptr manager_obj = orb_->resolve_initial_references ("RTSchedulerManager" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (scheduler_, @@ -43,11 +40,9 @@ DT_Test::init (int argc, char *argv [] CORBA::Object_var object = orb_->resolve_initial_references ("RTScheduler_Current" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); current_ = RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); return 0; } @@ -58,33 +53,25 @@ DT_Test::run (int argc, char* argv [] { init (argc,argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK; TASK_STATS::instance ()->init (this->dt_creator_->total_load ()); - if (this->dt_creator_->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER) == -1) + if (this->dt_creator_->resolve_naming_service () == -1) return; - ACE_CHECK; - this->dt_creator_->activate_root_poa (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->dt_creator_->activate_root_poa (); - this->dt_creator_->activate_poa_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->dt_creator_->activate_job_list (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->dt_creator_->activate_schedule (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->dt_creator_->activate_poa_list (); + this->dt_creator_->activate_job_list (); + this->dt_creator_->activate_schedule (); DT_Creator* dt_creator = this->dt_creator_; - dt_creator->register_synch_obj (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + dt_creator->register_synch_obj (); ACE_DEBUG ((LM_DEBUG, "Registered Synch Object\n")); dt_creator_->create_distributable_threads (current_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; orb_->destroy (); @@ -134,7 +121,6 @@ DT_Test::svc (void) { dt_creator_->create_distributable_threads (current_.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY @@ -166,7 +152,6 @@ main (int argc, char* argv []) "%t\n")); DT_TEST::instance ()->run (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp index 605979bb28f..221e7606b1f 100644 --- a/TAO/examples/RTScheduling/POA_Holder.cpp +++ b/TAO/examples/RTScheduling/POA_Holder.cpp @@ -157,7 +157,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ rt_orb->create_priority_model_policy (priority_model_, server_priority_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (lanes_.length () != 0) { @@ -177,13 +176,11 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Create a thread-pool policy. lanes_policy = rt_orb->create_threadpool_policy (threadpool_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated Lanes\n")); @@ -206,12 +203,10 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ max_buffered_requests, max_request_buffer_size ACE_ENV_ARG_PARAMETER); - ACE_CHECK; thread_pool_policy = rt_orb->create_threadpool_policy (threadpool_id_1 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated thread pool\n")); @@ -225,7 +220,6 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ bands_policy = rt_orb->create_priority_banded_connection_policy (this->bands_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated Bands\n")); @@ -306,12 +300,10 @@ POA_Holder::activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_ // Get the POA Manager. PortableServer::POAManager_var poa_manager = - parent_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + parent_poa->the_POAManager (); parent_poa->create_POA (POA_name_.c_str (), poa_manager.in (), poa_policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp index 8cd648b1cf3..cc81de0608c 100644 --- a/TAO/examples/RTScheduling/Starter.cpp +++ b/TAO/examples/RTScheduling/Starter.cpp @@ -14,10 +14,9 @@ Starter::Starter (CORBA::ORB_ptr orb) } void -Starter::init (ACE_ENV_SINGLE_ARG_DECL) +Starter::init (void) { - this->resolve_synch_objs (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->resolve_synch_objs (); this->fire (); } @@ -35,7 +34,7 @@ Starter::fire (void) } void -Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL) +Starter::resolve_synch_objs (void) { CosNaming::Name name (1); name.length (1); @@ -47,7 +46,6 @@ Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var object = this->naming_client_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->synch_context_ = CosNaming::NamingContext::_narrow (object.in ()); @@ -62,12 +60,10 @@ Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL) binding_list, iterator ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Add the receivers found in the bindinglist to the <receivers>. this->add_to_synchs (binding_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!CORBA::is_nil (iterator.in ())) { @@ -79,11 +75,9 @@ Starter::resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL) more = iterator->next_n (chunk, binding_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->add_to_synchs (binding_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } } @@ -140,12 +134,10 @@ main (int argc, char** argv) argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Starter starter (orb.in ()); - starter.init (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + starter.init (); } ACE_CATCHANY diff --git a/TAO/examples/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h index 13c7a0d0c80..3debbde8493 100644 --- a/TAO/examples/RTScheduling/Starter.h +++ b/TAO/examples/RTScheduling/Starter.h @@ -16,7 +16,7 @@ class Starter Starter (CORBA::ORB_ptr orb); - void init (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void init (void); void fire (void); @@ -25,7 +25,7 @@ class Starter ACE_Null_Mutex> Synchs; private: - void resolve_synch_objs (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void resolve_synch_objs (void); void add_to_synchs (CosNaming::BindingList &binding_list ACE_ENV_ARG_DECL_WITH_DEFAULTS); diff --git a/TAO/examples/RTScheduling/Thread_Task.cpp b/TAO/examples/RTScheduling/Thread_Task.cpp index ded158b93b0..ea0e50cc3eb 100644 --- a/TAO/examples/RTScheduling/Thread_Task.cpp +++ b/TAO/examples/RTScheduling/Thread_Task.cpp @@ -41,7 +41,6 @@ Thread_Task::svc (void) sched_param_.in (), implicit_sched_param.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_OS::memcpy (&count_, this->current_->id ()->get_buffer (), @@ -61,7 +60,6 @@ Thread_Task::svc (void) this->current_->end_scheduling_segment (name ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; dt_creator_->dt_ended () ; } |