diff options
Diffstat (limited to 'TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp')
-rw-r--r-- | TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp | 109 |
1 files changed, 56 insertions, 53 deletions
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp index d107eaba1e4..34c30b41cca 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp @@ -9,7 +9,10 @@ #include "ace/Stats.h" #include "ace/High_Res_Timer.h" -ACE_RCSID(Reliable, client, "$Id$") +ACE_RCSID (Reliable, + client, + "$Id$") + #define USING_TIMERS //#define USING_QUANTIFY @@ -131,8 +134,8 @@ print_params (void) } static void -twoway_work_test (Test_ptr server, - CORBA::Environment &ACE_TRY_ENV) +twoway_work_test (Test_ptr server + TAO_ENV_ARG_DECL) { #if defined (USING_TIMERS) ACE_Throughput_Stats latency; @@ -152,8 +155,8 @@ twoway_work_test (Test_ptr server, ACE_hrtime_t latency_base = ACE_OS::gethrtime (); #endif /* USING_TIMERS */ - server->twoway_work_test (work, - ACE_TRY_ENV); + server->twoway_work_test (work + TAO_ENV_ARG_PARAMETER); ACE_CHECK; #if defined (USING_TIMERS) @@ -176,8 +179,8 @@ twoway_work_test (Test_ptr server, } static void -oneway_work_test (Test_ptr server, - CORBA::Environment &ACE_TRY_ENV) +oneway_work_test (Test_ptr server + TAO_ENV_ARG_DECL) { #if defined (USING_TIMERS) ACE_Throughput_Stats latency; @@ -197,8 +200,8 @@ oneway_work_test (Test_ptr server, ACE_hrtime_t latency_base = ACE_OS::gethrtime (); #endif /* USING_TIMERS */ - server->oneway_work_test (work, - ACE_TRY_ENV); + server->oneway_work_test (work + TAO_ENV_ARG_PARAMETER); ACE_CHECK; #if defined (USING_TIMERS) @@ -221,8 +224,8 @@ oneway_work_test (Test_ptr server, } static void -oneway_payload_test (Test_ptr server, - CORBA::Environment &ACE_TRY_ENV) +oneway_payload_test (Test_ptr server + TAO_ENV_ARG_DECL) { #if defined (USING_TIMERS) ACE_Throughput_Stats latency; @@ -245,8 +248,8 @@ oneway_payload_test (Test_ptr server, ACE_hrtime_t latency_base = ACE_OS::gethrtime (); #endif /* USING_TIMERS */ - server->oneway_payload_test (the_data, - ACE_TRY_ENV); + server->oneway_payload_test (the_data + TAO_ENV_ARG_PARAMETER); ACE_CHECK; #if defined (USING_TIMERS) @@ -428,8 +431,8 @@ main (int argc, char *argv[]) CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "", - ACE_TRY_ENV); + "" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the command line options. @@ -441,31 +444,31 @@ main (int argc, char *argv[]) } CORBA::Object_var obj = - 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 (obj.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - obj = orb->resolve_initial_references ("PolicyCurrent", - ACE_TRY_ENV); + obj = orb->resolve_initial_references ("PolicyCurrent" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (obj.in (), - ACE_TRY_ENV); + CORBA::PolicyCurrent::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - obj = orb->string_to_object (ior, - ACE_TRY_ENV); + obj = orb->string_to_object (ior + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Test_var server = Test::_narrow (obj.in (), - ACE_TRY_ENV); + Test_var server = Test::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Print testing parameters. @@ -474,8 +477,8 @@ main (int argc, char *argv[]) // Run the test. if (test_twoway) { - twoway_work_test (server.in (), - ACE_TRY_ENV); + twoway_work_test (server.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else @@ -491,8 +494,8 @@ main (int argc, char *argv[]) // Set up the sync scope policy. sync_scope_policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope_any, - ACE_TRY_ENV); + sync_scope_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; switch (level) @@ -500,29 +503,29 @@ main (int argc, char *argv[]) case ORB_LEVEL: // Set the sync scope policy at the ORB level. policy_manager->set_policy_overrides (sync_scope_policy_list, - CORBA::ADD_OVERRIDE, - ACE_TRY_ENV); + CORBA::ADD_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; case THREAD_LEVEL: // Set the sync scope policy at the thread level. policy_current->set_policy_overrides (sync_scope_policy_list, - CORBA::ADD_OVERRIDE, - ACE_TRY_ENV); + CORBA::ADD_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; case OBJECT_LEVEL: // Set the sync scope policy at the object level. obj = server->_set_policy_overrides (sync_scope_policy_list, - CORBA::ADD_OVERRIDE, - ACE_TRY_ENV); + CORBA::ADD_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Get the new object reference with the updated policy. - server = Test::_narrow (obj.in (), - ACE_TRY_ENV); + server = Test::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; break; @@ -531,7 +534,7 @@ main (int argc, char *argv[]) } // We are done with this policy. - sync_scope_policy_list[0]->destroy (ACE_TRY_ENV); + sync_scope_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Are we buffering the oneway requests? @@ -554,33 +557,33 @@ main (int argc, char *argv[]) // Set up the buffering constraint policy. buffering_constraint_policy_list[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, - buffering_constraint_any, - ACE_TRY_ENV); + buffering_constraint_any + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Set up the constraints (at the object level). obj = server->_set_policy_overrides (buffering_constraint_policy_list, - CORBA::ADD_OVERRIDE, - ACE_TRY_ENV); + CORBA::ADD_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // We are done with this policy. - buffering_constraint_policy_list[0]->destroy (ACE_TRY_ENV); + buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Get the new object reference with the updated policy. - server = Test::_narrow (obj.in (), - ACE_TRY_ENV); + server = Test::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } // Run the oneway test. if (payload_test) - oneway_payload_test (server.in (), - ACE_TRY_ENV); + oneway_payload_test (server.in () + TAO_ENV_ARG_PARAMETER); else - oneway_work_test (server.in (), - ACE_TRY_ENV); + oneway_work_test (server.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -589,7 +592,7 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "\nShutting down server\n")); - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -599,7 +602,7 @@ main (int argc, char *argv[]) // static destructors to flush the queues, it will be too late. // Therefore, we use explicit destruction here and flush the // queues before main() ends. - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |