diff options
Diffstat (limited to 'TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index b5b04c3e371..49efa019ecf 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -41,8 +41,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, int burst_pause, int type_start, int type_count, - RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL) + RtecEventChannelAdmin::EventChannel_ptr ec) { this->burst_count_ = burst_count; this->burst_size_ = burst_size; @@ -52,7 +51,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, this->type_count_ = type_count; RtecScheduler::handle_t rt_info = - scheduler->create (name ACE_ENV_ARG_PARAMETER); + scheduler->create (name); ACE_Time_Value tv (0, burst_pause); RtecScheduler::Period_t rate = tv.usec () * 10; @@ -71,8 +70,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, RtecScheduler::VERY_LOW_IMPORTANCE, time, 1, - RtecScheduler::OPERATION - ACE_ENV_ARG_PARAMETER); + RtecScheduler::OPERATION); this->supplier_id_ = ACE::crc32 (name); ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name, @@ -99,8 +97,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, this->supplier_._this (); this->consumer_proxy_->connect_push_supplier (objref.in (), - qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + qos.get_SupplierQOS ()); } void @@ -118,15 +115,14 @@ Test_Supplier::disconnect (void) PortableServer::POA_var poa = this->supplier_._default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->supplier_); + poa->deactivate_object (id.in ()); } int Test_Supplier::svc () { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize a time value to pace the test ACE_Time_Value tv (0, this->burst_pause_); @@ -174,7 +170,7 @@ Test_Supplier::svc () ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, request_start); // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n")); - this->consumer_proxy ()->push (event ACE_ENV_ARG_PARAMETER); + this->consumer_proxy ()->push (event); ACE_hrtime_t end = ACE_OS::gethrtime (); this->throughput_.sample (end - test_start, @@ -197,20 +193,19 @@ Test_Supplier::svc () ACE_hrtime_t request_start = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, request_start); - this->consumer_proxy ()->push(event ACE_ENV_ARG_PARAMETER); + this->consumer_proxy ()->push(event); ACE_hrtime_t end = ACE_OS::gethrtime (); this->throughput_.sample (end - test_start, end - request_start); } - ACE_CATCH (CORBA::SystemException, sys_ex) + catch (const CORBA::SystemException& sys_ex) { - ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX"); + sys_ex._tao_print_exception ("SYS_EX"); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NON SYS EX"); + ex._tao_print_exception ("NON SYS EX"); } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "Supplier %4.4x completed\n", |