diff options
Diffstat (limited to 'TAO/performance-tests/Sequence_Latency/Deferred/client.cpp')
| -rw-r--r-- | TAO/performance-tests/Sequence_Latency/Deferred/client.cpp | 114 |
1 files changed, 38 insertions, 76 deletions
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp index b93bbd8ffbd..f1b31f293b2 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp @@ -96,7 +96,7 @@ parse_args (int argc, char *argv[]) int -test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) +test_octet_seq (Test::Roundtrip_ptr roundtrip) { ACE_Sample_History history (niterations); @@ -117,22 +117,18 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) CORBA::ULongLong start = ACE_OS::gethrtime (); request[j] = - roundtrip->_request ("test_octet_method" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + roundtrip->_request ("test_octet_method"); request[j]->add_in_arg ("octet_load") <<= ol; request[j]->add_in_arg ("send_time") <<= start; request[j]->set_return_type (CORBA::_tc_ulonglong); - request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + request[j]->send_deferred (); } for (j = 0; j != burst; ++j) { - request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + request[j]->get_response (); CORBA::ULongLong retval; if ((request[j]->return_value () >>= retval) == 1) @@ -169,7 +165,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) int -test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) +test_long_seq (Test::Roundtrip_ptr roundtrip) { ACE_Sample_History history (niterations); @@ -190,22 +186,18 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) CORBA::ULongLong start = ACE_OS::gethrtime (); request[j] = - roundtrip->_request ("test_long_method" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + roundtrip->_request ("test_long_method"); request[j]->add_in_arg ("long_load") <<= ll; request[j]->add_in_arg ("send_time") <<= start; request[j]->set_return_type (CORBA::_tc_ulonglong); - request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + request[j]->send_deferred (); } for (j = 0; j != burst; ++j) { - request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + request[j]->get_response (); CORBA::ULongLong retval; if ((request[j]->return_value () >>= retval) == 1) @@ -242,7 +234,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) int -test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) +test_short_seq (Test::Roundtrip_ptr roundtrip) { ACE_Sample_History history (niterations); @@ -263,22 +255,18 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) CORBA::ULongLong start = ACE_OS::gethrtime (); request[j] = - roundtrip->_request ("test_short_method" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + roundtrip->_request ("test_short_method"); request[j]->add_in_arg ("short_load") <<= sl; request[j]->add_in_arg ("send_time") <<= start; request[j]->set_return_type (CORBA::_tc_ulonglong); - request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + request[j]->send_deferred (); } for (j = 0; j != burst; ++j) { - request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + request[j]->get_response (); CORBA::ULongLong retval; if ((request[j]->return_value () >>= retval) == 1) @@ -315,7 +303,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) int -test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) +test_char_seq (Test::Roundtrip_ptr roundtrip) { ACE_Sample_History history (niterations); @@ -336,22 +324,18 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) CORBA::ULongLong start = ACE_OS::gethrtime (); request[j] = - roundtrip->_request ("test_char_method" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + roundtrip->_request ("test_char_method"); request[j]->add_in_arg ("char_load") <<= cl; request[j]->add_in_arg ("send_time") <<= start; request[j]->set_return_type (CORBA::_tc_ulonglong); - request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + request[j]->send_deferred (); } for (j = 0; j != burst; ++j) { - request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + request[j]->get_response (); CORBA::ULongLong retval; if ((request[j]->return_value () >>= retval) == 1) @@ -388,7 +372,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) int -test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) +test_longlong_seq (Test::Roundtrip_ptr roundtrip) { ACE_Sample_History history (niterations); @@ -409,22 +393,18 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) CORBA::ULongLong start = ACE_OS::gethrtime (); request[j] = - roundtrip->_request ("test_longlong_method" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + roundtrip->_request ("test_longlong_method"); request[j]->add_in_arg ("longlong_load") <<= ll; request[j]->add_in_arg ("send_time") <<= start; request[j]->set_return_type (CORBA::_tc_ulonglong); - request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + request[j]->send_deferred (); } for (j = 0; j != burst; ++j) { - request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + request[j]->get_response (); CORBA::ULongLong retval; if ((request[j]->return_value () >>= retval) == 1) @@ -461,7 +441,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) int -test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) +test_double_seq (Test::Roundtrip_ptr roundtrip) { ACE_Sample_History history (niterations); @@ -482,22 +462,18 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) CORBA::ULongLong start = ACE_OS::gethrtime (); request[j] = - roundtrip->_request ("test_double_method" - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + roundtrip->_request ("test_double_method"); request[j]->add_in_arg ("double_load") <<= dl; request[j]->add_in_arg ("send_time") <<= start; request[j]->set_return_type (CORBA::_tc_ulonglong); - request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + request[j]->send_deferred (); } for (j = 0; j != burst; ++j) { - request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); + request[j]->get_response (); CORBA::ULongLong retval; if ((request[j]->return_value () >>= retval) == 1) @@ -559,22 +535,19 @@ main (int argc, char *argv[]) "client (%P|%t): sched_params failed\n")); } - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->string_to_object (ior); Test::Roundtrip_var roundtrip = - Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + Test::Roundtrip::_narrow (object.in ()); if (CORBA::is_nil (roundtrip.in ())) { @@ -590,9 +563,7 @@ main (int argc, char *argv[]) { ACE_hrtime_t start = 0; (void) roundtrip->test_octet_method (oc, - start - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + start); } @@ -600,48 +571,39 @@ main (int argc, char *argv[]) if (ACE_OS::strcmp (data_type, "octet") == 0 ) { - test_octet_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + test_octet_seq (roundtrip.in ()); } else if (ACE_OS::strcmp (data_type, "char") == 0) { - test_char_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + test_char_seq (roundtrip.in ()); } else if (ACE_OS::strcmp (data_type, "long") == 0) { - test_long_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + test_long_seq (roundtrip.in ()); } else if (ACE_OS::strcmp (data_type, "short") == 0) { - test_short_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + test_short_seq (roundtrip.in ()); } else if (ACE_OS::strcmp (data_type, "double") == 0) { - test_double_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + test_double_seq (roundtrip.in ()); } else if (ACE_OS::strcmp (data_type, "longlong") == 0) { - test_longlong_seq (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + test_longlong_seq (roundtrip.in ()); } if (do_shutdown) { - roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + roundtrip->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } |