diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 00d03d647ef..5f81a9b265a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -22,26 +22,26 @@ TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void) TAO_EC_Filter* TAO_EC_Sched_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, - RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment &ACE_TRY_ENV) const + RtecEventChannelAdmin::ConsumerQOS& qos + TAO_ENV_ARG_DECL) const { CORBA::ULong pos = 0; CORBA::Object_var tmp = this->event_channel_->scheduler (); RtecScheduler::Scheduler_var scheduler = - RtecScheduler::Scheduler::_narrow (tmp.in (), ACE_TRY_ENV); + RtecScheduler::Scheduler::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // @@ How do we figure out which parent??? RtecScheduler::handle_t parent_info = - scheduler->lookup ("Dispatching_Task-250000.us", ACE_TRY_ENV); + scheduler->lookup ("Dispatching_Task-250000.us" TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->recursive_build (supplier, qos, pos, scheduler.in (), - parent_info, - ACE_TRY_ENV); + parent_info + TAO_ENV_ARG_PARAMETER); } TAO_EC_Filter* @@ -50,8 +50,8 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( RtecEventChannelAdmin::ConsumerQOS& qos, CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, - RtecScheduler::handle_t parent_info, - CORBA::Environment& ACE_TRY_ENV) const + RtecScheduler::handle_t parent_info + TAO_ENV_ARG_DECL) const { const RtecEventComm::Event& e = qos.dependencies[pos].event; @@ -60,12 +60,12 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( CORBA::ULong npos = pos; ACE_CString name; this->recursive_name (qos, npos, - scheduler, name, - ACE_TRY_ENV); + scheduler, name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str (), ACE_TRY_ENV); + scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; // Consume the designator @@ -77,8 +77,8 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( { children[i] = this->recursive_build (supplier, qos, pos, scheduler, - rt_info, - ACE_TRY_ENV); + rt_info + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -94,7 +94,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( RtecScheduler::CONJUNCTION), 0); TAO_EC_QOS_Info qos_info; - filter->get_qos_info (qos_info, ACE_TRY_ENV); + filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -105,12 +105,12 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( CORBA::ULong npos = pos; ACE_CString name; this->recursive_name (qos, npos, - scheduler, name, - ACE_TRY_ENV); + scheduler, name + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str (), ACE_TRY_ENV); + scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; // Consume the designator @@ -122,8 +122,8 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( { children[i] = this->recursive_build (supplier, qos, pos, scheduler, - rt_info, - ACE_TRY_ENV); + rt_info + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } TAO_EC_Sched_Filter *filter; @@ -139,7 +139,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( 0); TAO_EC_QOS_Info qos_info; - filter->get_qos_info (qos_info, ACE_TRY_ENV); + filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -161,7 +161,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( TAO_EC_QOS_Info qos_info; qos_info.rt_info = - scheduler->create (name.c_str (), ACE_TRY_ENV); + scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Convert the time to the proper units.... @@ -178,15 +178,15 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( RtecScheduler::VERY_LOW_IMPORTANCE, 0, // quantum 1, // threads - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); scheduler->add_dependency (qos_info.rt_info, parent_info, 1, - RtecBase::TWO_WAY_CALL, - ACE_TRY_ENV); + RtecBase::TWO_WAY_CALL + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return new TAO_EC_Timeout_Filter (this->event_channel_, @@ -199,14 +199,14 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info; RtecScheduler::RT_Info_var info = - scheduler->get (body_info, ACE_TRY_ENV); + scheduler->get (body_info TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_CString name = info->entry_point.in (); name += "#rep"; RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str (), ACE_TRY_ENV); + scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; @@ -222,7 +222,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( 0); TAO_EC_QOS_Info qos_info; - filter->get_qos_info (qos_info, ACE_TRY_ENV); + filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -233,8 +233,8 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( RtecEventChannelAdmin::ConsumerQOS& qos, CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, - ACE_CString& name, - CORBA::Environment& ACE_TRY_ENV) const + ACE_CString& name + TAO_ENV_ARG_DECL) const { const RtecEventComm::Event& e = qos.dependencies[pos].event; @@ -248,8 +248,8 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( ACE_CString child_name; this->recursive_name (qos, pos, scheduler, - child_name, - ACE_TRY_ENV); + child_name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (i == 0) @@ -273,8 +273,8 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( this->recursive_name (qos, pos, scheduler, - child_name, - ACE_TRY_ENV); + child_name + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (i == 0) @@ -305,7 +305,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info; RtecScheduler::RT_Info_var info = - scheduler->get (body_info, ACE_TRY_ENV); + scheduler->get (body_info TAO_ENV_ARG_PARAMETER); ACE_CHECK; name = info->entry_point.in (); |