diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index 020b750ffa5..01b0fbcb6b0 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -176,7 +176,6 @@ Throughput_StructuredPushSupplier::svc (void) this->proxy_->push_structured_event (event ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_hrtime_t end = ACE_OS::gethrtime (); this->throughput_.sample (end - this->throughput_start_, @@ -226,18 +225,15 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL) Notify_Test_Client::init_ORB (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Object_var manager_object = orb_->resolve_initial_references ("ORBPolicyManager" ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow (manager_object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); CORBA::Any sync_scope; sync_scope <<= Messaging::SYNC_WITH_TARGET; @@ -248,11 +244,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL) orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_scope ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); #else ACE_DEBUG ((LM_DEBUG, "CORBA Messaging disabled in this configuration," @@ -269,20 +263,17 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL) } // Create all participents ... - this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + this->create_EC (); CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); consumer_admin_ = ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); @@ -304,11 +295,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL) -1); consumers_[i]->init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); consumers_[i]->connect (this->consumer_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); } for (i = 0; i < this->supplier_count_; ++i) @@ -320,10 +309,8 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL) root_poa_.in () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (-1); suppliers_[i]->connect (this->supplier_admin_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); } return 0; @@ -424,7 +411,7 @@ Notify_Throughput::parse_args(int argc, char *argv[]) } void -Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL) +Notify_Throughput::create_EC (void) { if (this->collocated_ec_ == 1) { @@ -440,16 +427,13 @@ Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL) this->notify_factory_ = notify_service->create (this->root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (this->notify_factory_.in ())); } else { - this->resolve_naming_service (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; - this->resolve_Notify_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->resolve_naming_service (); + this->resolve_Notify_factory (); } // A channel name was specified, use that to resolve the service. @@ -462,12 +446,10 @@ Notify_Throughput::create_EC (ACE_ENV_SINGLE_ARG_DECL) CORBA::Object_var obj = this->naming_context_->resolve (name ACE_ENV_ARG_PARAMETER); - ACE_CHECK; this->ec_ = CosNotifyChannelAdmin::EventChannel::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { @@ -477,14 +459,13 @@ else initial_admin_, id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL) +Notify_Throughput::run_test (void) { ACE_DEBUG ((LM_DEBUG, "collocated_ec_ %d ," @@ -509,7 +490,6 @@ Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL) suppliers_[i]-> TAO_Notify_Tests_StructuredPushSupplier::init (root_poa_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (suppliers_[i]->ACE_Task_Base::activate (THR_NEW_LWP | THR_JOINABLE) != 0) { @@ -532,8 +512,7 @@ Notify_Throughput::run_test (ACE_ENV_SINGLE_ARG_DECL) if (this->ec_name_.length () == 0) // we are not using a global EC { // Destroy the ec. - this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->ec_->destroy (); } // Signal the workers. @@ -604,10 +583,8 @@ main (int argc, char* argv[]) { events.init (argc, argv ACE_ENV_ARG_PARAMETER); //Init the Client - ACE_TRY_CHECK; - events.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + events.run_test (); ACE_DEBUG ((LM_DEBUG, "Waiting for threads to exit...\n")); ACE_Thread_Manager::instance ()->wait (); |