diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp')
| -rw-r--r-- | TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp | 57 |
1 files changed, 28 insertions, 29 deletions
diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp index c95f50fc5d0..9de742cb799 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp @@ -58,17 +58,17 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { 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 manager_object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (manager_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -78,16 +78,16 @@ main (int argc, char *argv []) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope, - ACE_TRY_ENV); + sync_scope + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + 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 ())) @@ -96,14 +96,14 @@ main (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 (parse_args (argc, argv) != 0) @@ -111,12 +111,12 @@ main (int argc, char *argv []) // Get the event channel object reference CORBA::Object_var ec_object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in (), - ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ec.in ())) { @@ -129,13 +129,12 @@ main (int argc, char *argv []) ACE_NEW_RETURN (consumer_impl, ECS_Consumer*[consumer_count], 1); - int i; - for (i = 0; i != consumer_count; ++i) + for (int i = 0; i != consumer_count; ++i) { ACE_NEW_RETURN (consumer_impl[i], ECS_Consumer (iterations), 1); - consumer_impl[i]->connect (ec.in (), ACE_TRY_ENV); + consumer_impl[i]->connect (ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -145,7 +144,7 @@ main (int argc, char *argv []) 1); PortableServer::ServantBase_var supplier_owner (supplier_impl); - supplier_impl->connect (ec.in (), ACE_TRY_ENV); + supplier_impl->connect (ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n")); @@ -161,23 +160,23 @@ main (int argc, char *argv []) // event[0].data.payload.length(1024); ACE_hrtime_t start = ACE_OS::gethrtime (); - for (i = 0; i != iterations; ++i) + for (int i = 0; i != iterations; ++i) { ACE_hrtime_t creation = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, creation); // push one event... - supplier_impl->push (event, ACE_TRY_ENV); + supplier_impl->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_hrtime_t end = ACE_OS::gethrtime (); - for (i = 0; i != consumer_count; ++i) + for (int i = 0; i != consumer_count; ++i) { - consumer_impl[i]->disconnect (ACE_TRY_ENV); + consumer_impl[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - supplier_impl->disconnect (ACE_TRY_ENV); + supplier_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Calibrate the high resolution timer *before* starting the @@ -189,7 +188,7 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf)); ACE_Sample_History history (iterations); - for (int j = 0; j != iterations; ++j) + for (size_t j = 0; j != iterations; ++j) { ACE_UINT64 value = 0; for (int i = 0; i != consumer_count; ++i) @@ -197,7 +196,7 @@ main (int argc, char *argv []) ACE_Sample_History &consumer_history = consumer_impl[i]->sample_history (); - ACE_UINT64 consumer_sample = + ACE_UINT32 consumer_sample = consumer_history.get_sample (j); if (consumer_sample > value) value = consumer_sample; @@ -219,12 +218,12 @@ main (int argc, char *argv []) stats.samples_count ()); - orb->shutdown (0, ACE_TRY_ENV); + orb->shutdown (0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Thread_Manager::instance ()->wait (); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, ex) |