diff options
Diffstat (limited to 'TAO/performance-tests/Sequence_Latency/DSI/client.cpp')
| -rw-r--r-- | TAO/performance-tests/Sequence_Latency/DSI/client.cpp | 78 |
1 files changed, 26 insertions, 52 deletions
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp index 8298ea4930b..d3be007ed67 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp @@ -79,7 +79,7 @@ parse_args (int argc, char *argv[]) } void -test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) +test_octet_seq (Test::Roundtrip_ptr roundtrip) { ACE_Sample_History history (niterations); @@ -92,9 +92,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) ACE_hrtime_t start = ACE_OS::gethrtime (); (void) roundtrip->test_octet_method (ol, - start - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + start); ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); @@ -123,7 +121,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) } void -test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) +test_long_seq (Test::Roundtrip_ptr roundtrip) { ACE_Sample_History history (niterations); @@ -136,9 +134,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) ACE_hrtime_t start = ACE_OS::gethrtime (); (void) roundtrip->test_long_method (ll, - start - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + start); ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); @@ -168,7 +164,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) void -test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) +test_short_seq (Test::Roundtrip_ptr roundtrip) { ACE_Sample_History history (niterations); @@ -181,9 +177,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) ACE_hrtime_t start = ACE_OS::gethrtime (); (void) roundtrip->test_short_method (sl, - start - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + start); ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); @@ -213,7 +207,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) void -test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) +test_char_seq (Test::Roundtrip_ptr roundtrip) { ACE_Sample_History history (niterations); @@ -226,9 +220,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) ACE_hrtime_t start = ACE_OS::gethrtime (); (void) roundtrip->test_char_method (cl, - start - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + start); ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); @@ -258,7 +250,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) void -test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) +test_longlong_seq (Test::Roundtrip_ptr roundtrip) { ACE_Sample_History history (niterations); @@ -271,9 +263,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) ACE_hrtime_t start = ACE_OS::gethrtime (); (void) roundtrip->test_longlong_method (ll, - start - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + start); ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); @@ -303,7 +293,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) void -test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) +test_double_seq (Test::Roundtrip_ptr roundtrip) { ACE_Sample_History history (niterations); @@ -316,9 +306,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) ACE_hrtime_t start = ACE_OS::gethrtime (); (void) roundtrip->test_double_method (dl, - start - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + start); ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); @@ -371,22 +359,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 ())) { @@ -403,55 +388,44 @@ 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); } 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, "Exception caught:"); + ex._tao_print_exception ("Exception caught:"); return 1; } - ACE_ENDTRY; return 0; } |