diff options
Diffstat (limited to 'TAO/performance-tests/Latency/Deferred')
4 files changed, 10 insertions, 28 deletions
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp index 72f83576b44..a8f60e51d10 100644 --- a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp +++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp @@ -19,7 +19,7 @@ Roundtrip::test_method (Test::Timestamp send_time } void -Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Roundtrip::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Latency/Deferred/Roundtrip.h index 4beb6b62d87..1695c92c23b 100644 --- a/TAO/performance-tests/Latency/Deferred/Roundtrip.h +++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.h @@ -26,7 +26,7 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp index e7bd528901c..0c5e7235e14 100644 --- a/TAO/performance-tests/Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Latency/Deferred/client.cpp @@ -100,18 +100,15 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (roundtrip.in ())) { @@ -125,7 +122,6 @@ main (int argc, char *argv[]) { ACE_hrtime_t start = 0; (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_Sample_History history (niterations); @@ -146,19 +142,16 @@ main (int argc, char *argv[]) request[j] = roundtrip->_request ("test_method" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; request[j]->add_in_arg () <<= start; request[j]->set_return_type (CORBA::_tc_ulonglong); - request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + request[j]->send_deferred (); } for (j = 0; j != burst; ++j) { - request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + request[j]->get_response (); CORBA::ULongLong retval; if ((request[j]->return_value () >>= retval) == 1) @@ -193,8 +186,7 @@ main (int argc, char *argv[]) if (do_shutdown) { - roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + roundtrip->shutdown (); } } ACE_CATCHANY diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp index a76449261c5..ee7c7cc6a02 100644 --- a/TAO/performance-tests/Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Latency/Deferred/server.cpp @@ -66,11 +66,9 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -79,11 +77,9 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -95,12 +91,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(roundtrip_impl); Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + roundtrip_impl->_this (); CORBA::String_var ior = orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); @@ -112,19 +106,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { |