diff options
Diffstat (limited to 'TAO/performance-tests/Latency/DSI/client.cpp')
| -rw-r--r-- | TAO/performance-tests/Latency/DSI/client.cpp | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp index e4460d924b3..3c321546dfa 100644 --- a/TAO/performance-tests/Latency/DSI/client.cpp +++ b/TAO/performance-tests/Latency/DSI/client.cpp @@ -80,22 +80,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 ())) { @@ -108,8 +105,7 @@ main (int argc, char *argv[]) for (int j = 0; j < 100; ++j) { ACE_hrtime_t start = 0; - (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) roundtrip->test_method (start); } ACE_Sample_History history (niterations); @@ -119,8 +115,7 @@ main (int argc, char *argv[]) { ACE_hrtime_t start = ACE_OS::gethrtime (); - (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) roundtrip->test_method (start); ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); @@ -149,16 +144,14 @@ main (int argc, char *argv[]) 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; } |