diff options
Diffstat (limited to 'TAO/tests/AMI_Buffering/client.cpp')
| -rw-r--r-- | TAO/tests/AMI_Buffering/client.cpp | 155 |
1 files changed, 60 insertions, 95 deletions
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp index 83ee301c399..cbe44b66b1f 100644 --- a/TAO/tests/AMI_Buffering/client.cpp +++ b/TAO/tests/AMI_Buffering/client.cpp @@ -93,40 +93,36 @@ parse_args (int argc, char *argv[]) int run_message_count (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL); + Test::AMI_Buffering_Admin_ptr ami_buffering_admin); int run_timeout (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL); + Test::AMI_Buffering_Admin_ptr ami_buffering_admin); int run_timeout_reactive (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr oneway_buffering, - Test::AMI_Buffering_Admin_ptr oneway_buffering_admin - ACE_ENV_ARG_DECL); + Test::AMI_Buffering_Admin_ptr oneway_buffering_admin); int run_buffer_size (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL); + Test::AMI_Buffering_Admin_ptr ami_buffering_admin); int main (int argc, char *argv[]) { int test_failed = 0; - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -142,10 +138,10 @@ main (int argc, char *argv[]) return 1; CORBA::Object_var tmp = - orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(server_ior); Test::AMI_Buffering_var ami_buffering = - Test::AMI_Buffering::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::AMI_Buffering::_narrow(tmp.in ()); if (CORBA::is_nil (ami_buffering.in ())) { @@ -156,10 +152,10 @@ main (int argc, char *argv[]) } tmp = - orb->string_to_object(admin_ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object(admin_ior); Test::AMI_Buffering_Admin_var ami_buffering_admin = - Test::AMI_Buffering_Admin::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER); + Test::AMI_Buffering_Admin::_narrow(tmp.in ()); if (CORBA::is_nil (ami_buffering_admin.in ())) { @@ -182,8 +178,7 @@ main (int argc, char *argv[]) test_failed = run_message_count (orb.in (), ami_buffering.in (), - ami_buffering_admin.in () - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin.in ()); } else if (run_timeout_test) { @@ -192,8 +187,7 @@ main (int argc, char *argv[]) test_failed = run_timeout (orb.in (), ami_buffering.in (), - ami_buffering_admin.in () - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin.in ()); } else if (run_timeout_reactive_test) { @@ -202,8 +196,7 @@ main (int argc, char *argv[]) test_failed = run_timeout_reactive (orb.in (), ami_buffering.in (), - ami_buffering_admin.in () - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin.in ()); } else if (run_buffer_size_test) { @@ -212,8 +205,7 @@ main (int argc, char *argv[]) test_failed = run_buffer_size (orb.in (), ami_buffering.in (), - ami_buffering_admin.in () - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin.in ()); } else { @@ -227,17 +219,15 @@ main (int argc, char *argv[]) ami_buffering->shutdown (); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught in client:"); + ex._tao_print_exception ("Exception caught in client:"); return 1; } - ACE_ENDTRY; return test_failed; } @@ -246,14 +236,13 @@ int configure_policies (CORBA::ORB_ptr orb, const TAO::BufferingConstraint &buffering_constraint, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_out flusher - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_out flusher) { CORBA::Object_var object = - orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("PolicyCurrent"); CORBA::PolicyCurrent_var policy_current = - CORBA::PolicyCurrent::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + CORBA::PolicyCurrent::_narrow (object.in ()); if (CORBA::is_nil (policy_current.in ())) { @@ -269,15 +258,12 @@ configure_policies (CORBA::ORB_ptr orb, CORBA::PolicyList policies (2); policies.length (2); policies[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - scope_as_any - ACE_ENV_ARG_PARAMETER); + scope_as_any); policies[1] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, - buffering_as_any - ACE_ENV_ARG_PARAMETER); + buffering_as_any); - policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE); policies[0]->destroy (); policies[1]->destroy (); @@ -292,26 +278,23 @@ configure_policies (CORBA::ORB_ptr orb, policies.length (1); policies[0] = orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE, - buffering_as_any - ACE_ENV_ARG_PARAMETER); + buffering_as_any); object = ami_buffering->_set_policy_overrides (policies, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); policies[0]->destroy (); flusher = - Test::AMI_Buffering::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + Test::AMI_Buffering::_narrow (object.in ()); return 0; } void sync_server (CORBA::ORB_ptr orb, - Test::AMI_Buffering_ptr flusher - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_ptr flusher) { // Get back in sync with the server... flusher->flush (); @@ -319,7 +302,7 @@ sync_server (CORBA::ORB_ptr orb, // Drain responses from the queue ACE_Time_Value tv (0, 100000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); } int @@ -327,14 +310,13 @@ run_liveness_test (CORBA::ORB_ptr orb, Test::AMI_AMI_BufferingHandler_ptr reply_handler, Test::AMI_Buffering_ptr ami_buffering, Test::AMI_Buffering_ptr flusher, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { ACE_DEBUG ((LM_DEBUG, ".... checking for liveness\n")); int test_failed = 0; // Get back in sync with the server... - sync_server (orb, flusher ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher); CORBA::ULong send_count = ami_buffering_admin->request_count (); @@ -352,15 +334,14 @@ run_liveness_test (CORBA::ORB_ptr orb, for (int i = 0; i != liveness_test_iterations; ++i) { ami_buffering->sendc_receive_data (reply_handler, - payload - ACE_ENV_ARG_PARAMETER); + payload); send_count++; CORBA::ULong receive_count = ami_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); // Once the system has sent enough messages we don't // expect it to fall too far behind, i.e. at least 90% of the @@ -377,12 +358,12 @@ run_liveness_test (CORBA::ORB_ptr orb, "expected %u\n", i, receive_count, expected)); - sync_server (orb, flusher ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher); } if (depth++ == LIVENESS_MAX_DEPTH) { - sync_server (orb, flusher ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher); depth = 0; } @@ -394,8 +375,7 @@ run_liveness_test (CORBA::ORB_ptr orb, int run_message_count (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_MESSAGE_COUNT; @@ -406,8 +386,7 @@ run_message_count (CORBA::ORB_ptr orb, Test::AMI_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, - ami_buffering, flusher.out () - ACE_ENV_ARG_PARAMETER); + ami_buffering, flusher.out ()); if (test_failed != 0) return test_failed; @@ -429,7 +408,7 @@ run_message_count (CORBA::ORB_ptr orb, CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher.in ()); CORBA::ULong initial_receive_count = ami_buffering_admin->request_count (); @@ -445,15 +424,14 @@ run_message_count (CORBA::ORB_ptr orb, while (1) { ami_buffering->sendc_receive_data (reply_handler.in (), - payload - ACE_ENV_ARG_PARAMETER); + payload); send_count++; CORBA::ULong receive_count = ami_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); CORBA::ULong iteration_count = send_count - initial_receive_count; @@ -491,8 +469,7 @@ run_message_count (CORBA::ORB_ptr orb, reply_handler.in (), ami_buffering, flusher.in (), - ami_buffering_admin - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin); if (liveness_test_failed) test_failed = 1; @@ -503,8 +480,7 @@ run_message_count (CORBA::ORB_ptr orb, int run_timeout (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_TIMEOUT; @@ -515,8 +491,7 @@ run_timeout (CORBA::ORB_ptr orb, Test::AMI_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, - ami_buffering, flusher.out () - ACE_ENV_ARG_PARAMETER); + ami_buffering, flusher.out ()); if (test_failed != 0) return test_failed; @@ -538,7 +513,7 @@ run_timeout (CORBA::ORB_ptr orb, CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher.in ()); CORBA::ULong initial_receive_count = ami_buffering_admin->request_count (); @@ -555,15 +530,14 @@ run_timeout (CORBA::ORB_ptr orb, while (1) { ami_buffering->sendc_receive_data (reply_handler.in (), - payload - ACE_ENV_ARG_PARAMETER); + payload); send_count++; CORBA::ULong receive_count = ami_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; if (receive_count != initial_receive_count) @@ -601,8 +575,7 @@ run_timeout (CORBA::ORB_ptr orb, reply_handler.in (), ami_buffering, flusher.in (), - ami_buffering_admin - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin); if (liveness_test_failed) test_failed = 1; @@ -613,8 +586,7 @@ run_timeout (CORBA::ORB_ptr orb, int run_timeout_reactive (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_TIMEOUT; @@ -625,8 +597,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, Test::AMI_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, - ami_buffering, flusher.out () - ACE_ENV_ARG_PARAMETER); + ami_buffering, flusher.out ()); if (test_failed != 0) return test_failed; @@ -648,7 +619,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, CORBA::ULong send_count = 0; for (int i = 0; i != iterations; ++i) { - sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher.in ()); CORBA::ULong initial_receive_count = ami_buffering_admin->request_count (); @@ -664,8 +635,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, for (int j = 0; j != 20; ++j) { ami_buffering->sendc_receive_data (reply_handler.in (), - payload - ACE_ENV_ARG_PARAMETER); + payload); send_count++; } while (1) @@ -674,7 +644,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, ami_buffering_admin->request_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); ACE_Time_Value elapsed = ACE_OS::gettimeofday () - start; if (receive_count != initial_receive_count) @@ -713,8 +683,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, reply_handler.in (), ami_buffering, flusher.in (), - ami_buffering_admin - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin); if (liveness_test_failed) test_failed = 1; @@ -727,8 +696,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb, int run_buffer_size (CORBA::ORB_ptr orb, Test::AMI_Buffering_ptr ami_buffering, - Test::AMI_Buffering_Admin_ptr ami_buffering_admin - ACE_ENV_ARG_DECL) + Test::AMI_Buffering_Admin_ptr ami_buffering_admin) { TAO::BufferingConstraint buffering_constraint; buffering_constraint.mode = TAO::BUFFER_MESSAGE_BYTES; @@ -739,8 +707,7 @@ run_buffer_size (CORBA::ORB_ptr orb, Test::AMI_Buffering_var flusher; int test_failed = configure_policies (orb, buffering_constraint, - ami_buffering, flusher.out () - ACE_ENV_ARG_PARAMETER); + ami_buffering, flusher.out ()); if (test_failed != 0) return test_failed; @@ -760,7 +727,7 @@ run_buffer_size (CORBA::ORB_ptr orb, CORBA::ULong bytes_sent = 0; for (int i = 0; i != iterations; ++i) { - sync_server (orb, flusher.in () ACE_ENV_ARG_PARAMETER); + sync_server (orb, flusher.in ()); CORBA::ULong initial_bytes_received = ami_buffering_admin->bytes_received_count (); @@ -776,15 +743,14 @@ run_buffer_size (CORBA::ORB_ptr orb, while (1) { ami_buffering->sendc_receive_data (reply_handler.in (), - payload - ACE_ENV_ARG_PARAMETER); + payload); bytes_sent += PAYLOAD_LENGTH; CORBA::ULong bytes_received = ami_buffering_admin->bytes_received_count (); ACE_Time_Value tv (0, 10 * 1000); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); CORBA::ULong payload_delta = bytes_sent - initial_bytes_received; @@ -827,8 +793,7 @@ run_buffer_size (CORBA::ORB_ptr orb, reply_handler.in (), ami_buffering, flusher.in (), - ami_buffering_admin - ACE_ENV_ARG_PARAMETER); + ami_buffering_admin); if (liveness_test_failed) test_failed = 1; |