diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 07f8ca298d9..3a2533f44d4 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -88,18 +88,18 @@ EC_Reconnect::modify_attributes (TAO_EC_Event_Channel_Attributes& attr) } void -EC_Reconnect::execute_test (CORBA::Environment& ACE_TRY_ENV) +EC_Reconnect::execute_test (TAO_ENV_SINGLE_ARG_DECL) { - this->execute_consumer_test (ACE_TRY_ENV); + this->execute_consumer_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->execute_supplier_test (ACE_TRY_ENV); + this->execute_supplier_test (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); this->consumer_reconnect_.dump_results ("Reconnect/consumer", gsf); this->supplier_reconnect_.dump_results ("Reconnect/supplier", gsf); - // this->EC_Driver::execute_test (ACE_TRY_ENV); + // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); } void @@ -108,11 +108,11 @@ EC_Reconnect::dump_results (void) } void -EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV) +EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ConsumerQOS qos; int shutdown_event_type; - this->build_consumer_qos (0, qos, shutdown_event_type, ACE_TRY_ENV); + this->build_consumer_qos (0, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->allow_consumer_reconnect_) @@ -122,8 +122,8 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->consumers_[0]->connect (qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t stop = ACE_OS::gethrtime (); this->consumer_reconnect_.sample (stop - start_time, @@ -135,8 +135,8 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV) ACE_TRY { this->consumers_[0]->connect (qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_ERROR, "Expected exception\n")); @@ -153,19 +153,19 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV) ACE_ENDTRY; RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (ACE_TRY_ENV); + this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t start_time = ACE_OS::gethrtime (); for (int i = 0; i < this->disconnections_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->consumers_[0]->disconnect (ACE_TRY_ENV); + this->consumers_[0]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumers_[0]->connect (consumer_admin.in (), qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t stop = ACE_OS::gethrtime (); this->consumer_reconnect_.sample (stop - start_time, @@ -175,11 +175,11 @@ EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV) } void -EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV) +EC_Reconnect::execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::SupplierQOS qos; int shutdown_event_type; - this->build_supplier_qos (0, qos, shutdown_event_type, ACE_TRY_ENV); + this->build_supplier_qos (0, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (this->allow_supplier_reconnect_) @@ -188,8 +188,8 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV) for (int i = 0; i < this->disconnections_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->suppliers_[0]->connect (qos, shutdown_event_type, - ACE_TRY_ENV); + this->suppliers_[0]->connect (qos, shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t stop = ACE_OS::gethrtime (); this->supplier_reconnect_.sample (stop - start_time, @@ -200,8 +200,8 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV) { ACE_TRY { - this->suppliers_[0]->connect (qos, shutdown_event_type, - ACE_TRY_ENV); + this->suppliers_[0]->connect (qos, shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_ERROR, "Expected exception\n")); @@ -218,19 +218,19 @@ EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV) ACE_ENDTRY; RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel_->for_suppliers (ACE_TRY_ENV); + this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t start_time = ACE_OS::gethrtime (); for (int i = 0; i < this->disconnections_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->suppliers_[0]->disconnect (ACE_TRY_ENV); + this->suppliers_[0]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->suppliers_[0]->connect (supplier_admin.in (), qos, - shutdown_event_type, - ACE_TRY_ENV); + shutdown_event_type + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t stop = ACE_OS::gethrtime (); this->supplier_reconnect_.sample (stop - start_time, |