diff options
Diffstat (limited to 'TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp | 284 |
1 files changed, 142 insertions, 142 deletions
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index e51f97f027a..c7c895f046b 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -133,16 +133,16 @@ print_priority_info (const char *const name) int Test_ECG::run (int argc, char* argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", - ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -151,14 +151,14 @@ Test_ECG::run (int argc, char* argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv)) @@ -260,7 +260,7 @@ Test_ECG::run (int argc, char* argv[]) print_priority_info ("Test_ECG::run (Main after thr_setprio)"); CORBA::Object_var naming_obj = - orb->resolve_initial_references ("NameService", ACE_TRY_ENV); + orb->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (naming_obj.in ())) @@ -269,7 +269,7 @@ Test_ECG::run (int argc, char* argv[]) 1); CosNaming::NamingContext_var naming_context = - CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV); + CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; auto_ptr<POA_RtecScheduler::Scheduler> scheduler_impl; @@ -291,7 +291,7 @@ Test_ECG::run (int argc, char* argv[]) } if (scheduler_impl.get () == 0) return -1; - scheduler = scheduler_impl->_this (ACE_TRY_ENV); + scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -314,7 +314,7 @@ Test_ECG::run (int argc, char* argv[]) if (scheduler_impl.get () == 0) return -1; - scheduler = scheduler_impl->_this (ACE_TRY_ENV); + scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else if (ACE_OS::strcmp (this->lcl_name_, "ECM2") == 0) @@ -335,7 +335,7 @@ Test_ECG::run (int argc, char* argv[]) if (scheduler_impl.get () == 0) return -1; - scheduler = scheduler_impl->_this (ACE_TRY_ENV); + scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else if (ACE_OS::strcmp (this->lcl_name_, "ECM3") == 0) @@ -356,7 +356,7 @@ Test_ECG::run (int argc, char* argv[]) if (scheduler_impl.get () == 0) return -1; - scheduler = scheduler_impl->_this (ACE_TRY_ENV); + scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -370,7 +370,7 @@ Test_ECG::run (int argc, char* argv[]) if (scheduler_impl.get () == 0) return -1; - scheduler = scheduler_impl->_this (ACE_TRY_ENV); + scheduler = scheduler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } break; @@ -393,7 +393,7 @@ Test_ECG::run (int argc, char* argv[]) case Test_ECG::ss_runtime: { CORBA::String_var str = - orb->object_to_string (scheduler.in (), ACE_TRY_ENV); + orb->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n", str.in ())); @@ -405,7 +405,7 @@ Test_ECG::run (int argc, char* argv[]) CosNaming::Name schedule_name (1); schedule_name.length (1); schedule_name[0].id = CORBA::string_dup (buf); - naming_context->bind (schedule_name, scheduler.in (), ACE_TRY_ENV); + naming_context->bind (schedule_name, scheduler.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_Scheduler_Factory::use_config (naming_context.in (), @@ -422,11 +422,11 @@ Test_ECG::run (int argc, char* argv[]) // Register Event_Service with the Naming Service. RtecEventChannelAdmin::EventChannel_var ec = - ec_impl._this (ACE_TRY_ENV); + ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = - orb->object_to_string (ec.in (), ACE_TRY_ENV); + orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (5); @@ -438,7 +438,7 @@ Test_ECG::run (int argc, char* argv[]) CosNaming::Name channel_name (1); channel_name.length (1); channel_name[0].id = CORBA::string_dup (buf); - naming_context->bind (channel_name, ec.in (), ACE_TRY_ENV); + naming_context->bind (channel_name, ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "waiting to start\n")); @@ -447,7 +447,7 @@ Test_ECG::run (int argc, char* argv[]) if (this->rmt_name_ != 0) { - orb->run (&tv, ACE_TRY_ENV); + orb->run (&tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -455,23 +455,23 @@ Test_ECG::run (int argc, char* argv[]) RtecEventChannelAdmin::EventChannel_var local_ec = this->get_ec (naming_context.in (), - this->lcl_name_, - ACE_TRY_ENV); + this->lcl_name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "located local EC\n")); for (int sd = 0; sd < this->supplier_disconnects_; ++sd) { - this->connect_suppliers (local_ec.in (), ACE_TRY_ENV); + this->connect_suppliers (local_ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->disconnect_suppliers (ACE_TRY_ENV); + this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (5); ACE_DEBUG ((LM_DEBUG, "Supplier disconnection %d\n", sd)); } - this->connect_suppliers (local_ec.in (), ACE_TRY_ENV); + this->connect_suppliers (local_ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected supplier\n")); @@ -480,13 +480,13 @@ Test_ECG::run (int argc, char* argv[]) if (this->rmt_name_ != 0) { tv.set (5, 0); - orb->run (&tv, ACE_TRY_ENV); + orb->run (&tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var remote_ec = this->get_ec (naming_context.in (), - this->rmt_name_, - ACE_TRY_ENV); + this->rmt_name_ + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "located remote EC\n")); @@ -500,48 +500,48 @@ Test_ECG::run (int argc, char* argv[]) } rsch_name[0].id = CORBA::string_dup (buf); CORBA::Object_var tmpobj = - naming_context->resolve (rsch_name, ACE_TRY_ENV); + naming_context->resolve (rsch_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecScheduler::Scheduler_var remote_sch = - RtecScheduler::Scheduler::_narrow (tmpobj.in (), ACE_TRY_ENV); + RtecScheduler::Scheduler::_narrow (tmpobj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->connect_ecg (local_ec.in (), remote_ec.in (), - remote_sch.in (), - ACE_TRY_ENV); + remote_sch.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected proxy\n")); tv.set (5, 0); - orb->run (&tv, ACE_TRY_ENV); + orb->run (&tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::Observer_ptr observer = - this->ecg_._this (ACE_TRY_ENV); + this->ecg_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - observer_handle = ec_impl.append_observer (observer, - ACE_TRY_ENV); + observer_handle = ec_impl.append_observer (observer + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } for (int cd = 0; cd < this->consumer_disconnects_; ++cd) { - this->connect_consumers (local_ec.in (), ACE_TRY_ENV); + this->connect_consumers (local_ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->disconnect_consumers (ACE_TRY_ENV); + this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_OS::sleep (5); ACE_DEBUG ((LM_DEBUG, "Consumer disconnection %d\n", cd)); } - this->connect_consumers (local_ec.in (), ACE_TRY_ENV); + this->connect_consumers (local_ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "connected consumer\n")); - this->activate_suppliers (local_ec.in (), ACE_TRY_ENV); + this->activate_suppliers (local_ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "suppliers are active\n")); @@ -560,7 +560,7 @@ Test_ECG::run (int argc, char* argv[]) if (this->rmt_name_ != 0) { - ec_impl.remove_observer (observer_handle, ACE_TRY_ENV); + ec_impl.remove_observer (observer_handle TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -568,7 +568,7 @@ Test_ECG::run (int argc, char* argv[]) ec_impl.activate (); ACE_DEBUG ((LM_DEBUG, "running the test\n")); - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->test_stop_ = ACE_OS::gethrtime (); @@ -603,7 +603,7 @@ Test_ECG::run (int argc, char* argv[]) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos_out, configs_out, anomalies_out, ACE_TRY_ENV); + infos_out, configs_out, anomalies_out TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else /* ! __SUNPRO_CC */ ACE_Scheduler_Factory::server ()->compute_scheduling @@ -611,8 +611,8 @@ Test_ECG::run (int argc, char* argv[]) ACE_SCOPE_THREAD), ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD), - infos.out (), configs.out (), anomalies.out (), - ACE_TRY_ENV); + infos.out (), configs.out (), anomalies.out () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif /* ! __SUNPRO_CC */ @@ -622,25 +622,25 @@ Test_ECG::run (int argc, char* argv[]) this->schedule_file_); } - naming_context->unbind (channel_name, ACE_TRY_ENV); + naming_context->unbind (channel_name TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->rmt_name_ != 0) { - this->ecg_.close (ACE_TRY_ENV); + this->ecg_.close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->ecg_.shutdown (ACE_TRY_ENV); + this->ecg_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - this->disconnect_consumers (ACE_TRY_ENV); + this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->disconnect_suppliers (ACE_TRY_ENV); + this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "shutdown grace period\n")); tv.set (5, 0); - orb->run (&tv, ACE_TRY_ENV); + orb->run (&tv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::SystemException, sys_ex) @@ -657,8 +657,8 @@ Test_ECG::run (int argc, char* argv[]) RtecEventChannelAdmin::EventChannel_ptr Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context, - const char* process_name, - CORBA::Environment &ACE_TRY_ENV) + const char* process_name + TAO_ENV_ARG_DECL) { const int bufsize = 512; char buf[bufsize]; @@ -670,28 +670,28 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context, channel_name[0].id = CORBA::string_dup (buf); CORBA::Object_var ec_ptr = - naming_context->resolve (channel_name, ACE_TRY_ENV); + naming_context->resolve (channel_name TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (RtecEventChannelAdmin::EventChannel::_nil ()); if (CORBA::is_nil (ec_ptr.in ())) return RtecEventChannelAdmin::EventChannel::_nil (); - return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in (), - ACE_TRY_ENV); + return RtecEventChannelAdmin::EventChannel::_narrow (ec_ptr.in () + TAO_ENV_ARG_PARAMETER); } void -Test_ECG::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV) +Test_ECG::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->hp_suppliers_ + this->lp_suppliers_; ++i) { - this->suppliers_[i]->close (ACE_TRY_ENV); + this->suppliers_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &ACE_TRY_ENV) +Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL) { int i; for (i = 0; i < this->hp_suppliers_; ++i) @@ -712,8 +712,8 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, this->hps_event_b_, mc, this->hp_interval_ * 10, - local_ec, - ACE_TRY_ENV); + local_ec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -736,25 +736,25 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, this->lps_event_b_, mc, this->lp_interval_ * 10, - local_ec, - ACE_TRY_ENV); + local_ec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } void -Test_ECG::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV) +Test_ECG::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) { for (int i = 0; i < this->hp_consumers_ + this->lp_consumers_; ++i) { - this->consumers_[i]->close (ACE_TRY_ENV); + this->consumers_[i]->close (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } void -Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &ACE_TRY_ENV) +Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL) { ACE_TRY { @@ -771,8 +771,8 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, this->suppliers_[i]->activate (buf, this->hp_interval_ * 10, - local_ec, - ACE_TRY_ENV); + local_ec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -789,8 +789,8 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, this->suppliers_[i]->activate (buf, this->lp_interval_ * 10, - local_ec, - ACE_TRY_ENV); + local_ec + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -802,8 +802,8 @@ Test_ECG::activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec, } void -Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec, - CORBA::Environment &ACE_TRY_ENV) +Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec + TAO_ENV_ARG_DECL) { int i; for (i = 0; i < this->hp_consumers_; ++i) @@ -817,8 +817,8 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec, this->consumers_[i]->open (buf, this->hpc_event_a_, this->hpc_event_b_, - local_ec, - ACE_TRY_ENV); + local_ec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->stats_[i].total_time_ = 0; this->stats_[i].lcl_count_ = 0; @@ -837,8 +837,8 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec, this->consumers_[i]->open (buf, this->lpc_event_a_, this->lpc_event_b_, - local_ec, - ACE_TRY_ENV); + local_ec + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->stats_[i].total_time_ = 0; this->stats_[i].lcl_count_ = 0; @@ -850,8 +850,8 @@ Test_ECG::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec, void Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec, RtecEventChannelAdmin::EventChannel_ptr remote_ec, - RtecScheduler::Scheduler_ptr remote_sch, - CORBA::Environment &ACE_TRY_ENV) + RtecScheduler::Scheduler_ptr remote_sch + TAO_ENV_ARG_DECL) { RtecScheduler::Scheduler_ptr local_sch = ACE_Scheduler_Factory::server (); @@ -877,22 +877,22 @@ Test_ECG::connect_ecg (RtecEventChannelAdmin::EventChannel_ptr local_ec, ACE_OS::strcat (lcl, this->lcl_name_); this->ecg_.init (remote_ec, local_ec, remote_sch, local_sch, - rmt, lcl, ACE_TRY_ENV); + rmt, lcl TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void Test_ECG::push_supplier (void * /* cookie */, RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer, - const RtecEventComm::EventSet &events, - CORBA::Environment & ACE_TRY_ENV) + const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL) { this->wait_until_ready (); // ACE_DEBUG ((LM_DEBUG, "(%P|%t) events sent by supplier\n")); // @@ TODO we could keep somekind of stats here... if (!this->short_circuit_) { - consumer->push (events, ACE_TRY_ENV); + consumer->push (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else @@ -900,12 +900,12 @@ Test_ECG::push_supplier (void * /* cookie */, int i = 0; for (; i < this->hp_consumers_; ++i) { - this->consumers_[i]->push (events, ACE_TRY_ENV); + this->consumers_[i]->push (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } for (; i < this->hp_consumers_ + this->lp_consumers_; ++i) { - this->consumers_[i]->push (events, ACE_TRY_ENV); + this->consumers_[i]->push (events TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -914,8 +914,8 @@ Test_ECG::push_supplier (void * /* cookie */, void Test_ECG::push_consumer (void *consumer_cookie, ACE_hrtime_t arrival, - const RtecEventComm::EventSet &events, - CORBA::Environment &) + const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED) { int ID = (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie) @@ -1008,8 +1008,8 @@ Test_ECG::wait_until_ready (void) void Test_ECG::shutdown_supplier (void* /* supplier_cookie */, - RtecEventComm::PushConsumer_ptr consumer, - CORBA::Environment& ACE_TRY_ENV) + RtecEventComm::PushConsumer_ptr consumer + TAO_ENV_ARG_DECL) { this->running_suppliers_--; @@ -1027,7 +1027,7 @@ Test_ECG::shutdown_supplier (void* /* supplier_cookie */, ACE_hrtime_t t = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (s.header.creation_time, t); s.header.type = ACE_ES_EVENT_SHUTDOWN; - consumer->push (shutdown, ACE_TRY_ENV); + consumer->push (shutdown TAO_ENV_ARG_PARAMETER); } void @@ -1048,13 +1048,13 @@ Test_ECG::shutdown_consumer (int id) } int -Test_ECG::shutdown (CORBA::Environment& ACE_TRY_ENV) +Test_ECG::shutdown (TAO_ENV_SINGLE_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "Shutting down the multiple EC test\n")); if (this->rmt_name_ != 0) { - this->ecg_.shutdown (ACE_TRY_ENV); + this->ecg_.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -1306,8 +1306,8 @@ Test_Supplier::open (const char* name, int event_b, int message_count, const RtecScheduler::Period_t& rate, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { this->event_a_ = event_a; this->event_b_ = event_b; @@ -1317,7 +1317,7 @@ Test_Supplier::open (const char* name, ACE_Scheduler_Factory::server (); RtecScheduler::handle_t rt_info = - server->create (name, ACE_TRY_ENV); + server->create (name TAO_ENV_ARG_PARAMETER); ACE_CHECK; // The execution times are set to reasonable values, but @@ -1335,8 +1335,8 @@ Test_Supplier::open (const char* name, RtecScheduler::VERY_LOW_IMPORTANCE, time, 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; this->supplier_id_ = ACE::crc32 (name); @@ -1355,38 +1355,38 @@ Test_Supplier::open (const char* name, rt_info, 1); RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_TRY_ENV); + ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - RtecEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV); + RtecEventComm::PushSupplier_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_->connect_push_supplier (objref.in (), - qos.get_SupplierQOS (), - ACE_TRY_ENV); + qos.get_SupplierQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Test_Supplier::close (CORBA::Environment &ACE_TRY_ENV) +Test_Supplier::close (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; RtecEventChannelAdmin::ProxyPushConsumer_var proxy = this->consumer_proxy_._retn (); - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); } void Test_Supplier::activate (const char* name, const RtecScheduler::Period_t& rate, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecScheduler::Scheduler_ptr server = ACE_Scheduler_Factory::server (); @@ -1396,7 +1396,7 @@ Test_Supplier::activate (const char* name, ACE_OS::strcpy (buf, "consumer_"); ACE_OS::strcat (buf, name); RtecScheduler::handle_t rt_info = - server->create (buf, ACE_TRY_ENV); + server->create (buf TAO_ENV_ARG_PARAMETER); ACE_CHECK; // The execution times are set to reasonable values, but @@ -1414,8 +1414,8 @@ Test_Supplier::activate (const char* name, RtecScheduler::VERY_LOW_IMPORTANCE, time, 1, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Also connect our consumer for timeout events from the EC. @@ -1433,27 +1433,27 @@ Test_Supplier::activate (const char* name, // = Connect as a consumer. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushConsumer_var cref = - this->consumer_._this (ACE_TRY_ENV); + this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_->connect_push_consumer ( cref.in (), - consumer_qos.get_ConsumerQOS (), - ACE_TRY_ENV); + consumer_qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Test_Supplier::push (const RtecEventComm::EventSet& events, - CORBA::Environment& ACE_TRY_ENV) +Test_Supplier::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) { #if 0 const int bufsize = 128; @@ -1491,11 +1491,11 @@ Test_Supplier::push (const RtecEventComm::EventSet& events, if (this->message_count_ < 0) { - //this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); - //if (ACE_TRY_ENV.exception () != 0) return; + //this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + //if (TAO_ENV_SINGLE_ARG_PARAMETER.exception () != 0) return; this->test_->shutdown_supplier (this->cookie_, - this->consumer_proxy_.in (), - ACE_TRY_ENV); + this->consumer_proxy_.in () + TAO_ENV_ARG_PARAMETER); } if (this->message_count_ % 2 == 0) { @@ -1509,22 +1509,22 @@ Test_Supplier::push (const RtecEventComm::EventSet& events, } this->test_->push_supplier (this->cookie_, this->consumer_proxy_.in (), - sent, - ACE_TRY_ENV); + sent + TAO_ENV_ARG_PARAMETER); } void -Test_Supplier::disconnect_push_supplier (CORBA::Environment& ACE_TRY_ENV) +Test_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV); + this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); } void -Test_Supplier::disconnect_push_consumer (CORBA::Environment &) +Test_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) { } @@ -1543,14 +1543,14 @@ Test_Consumer::Test_Consumer (Test_ECG *test, void Test_Consumer::open (const char* name, int event_a, int event_b, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment& ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecScheduler::Scheduler_ptr server = ACE_Scheduler_Factory::server (); RtecScheduler::handle_t rt_info = - server->create (name, ACE_TRY_ENV); + server->create (name TAO_ENV_ARG_PARAMETER); ACE_CHECK; // The worst case execution time is far less than 2 @@ -1566,8 +1566,8 @@ Test_Consumer::open (const char* name, RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, - RtecScheduler::OPERATION, - ACE_TRY_ENV); + RtecScheduler::OPERATION + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ConsumerQOS_Factory qos; @@ -1578,44 +1578,44 @@ Test_Consumer::open (const char* name, // = Connect as a consumer. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV); + RtecEventComm::PushConsumer_var objref = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_->connect_push_consumer (objref.in (), - qos.get_ConsumerQOS (), - ACE_TRY_ENV); + qos.get_ConsumerQOS () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -Test_Consumer::close (CORBA::Environment &ACE_TRY_ENV) +Test_Consumer::close (TAO_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; RtecEventChannelAdmin::ProxyPushSupplier_var proxy = this->supplier_proxy_._retn (); - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); } void -Test_Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &ACE_TRY_ENV) +Test_Consumer::push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t arrival = ACE_OS::gethrtime (); - this->test_->push_consumer (this->cookie_, arrival, events, ACE_TRY_ENV); + this->test_->push_consumer (this->cookie_, arrival, events TAO_ENV_ARG_PARAMETER); } void -Test_Consumer::disconnect_push_consumer (CORBA::Environment &) +Test_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } |