diff options
Diffstat (limited to 'TAO/performance-tests/Latency/DII')
| -rw-r--r-- | TAO/performance-tests/Latency/DII/Roundtrip.cpp | 8 | ||||
| -rw-r--r-- | TAO/performance-tests/Latency/DII/Roundtrip.h | 6 | ||||
| -rw-r--r-- | TAO/performance-tests/Latency/DII/client.cpp | 16 | ||||
| -rw-r--r-- | TAO/performance-tests/Latency/DII/server.cpp | 20 |
4 files changed, 25 insertions, 25 deletions
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Latency/DII/Roundtrip.cpp index 8d780f15724..c211bfe9bc6 100644 --- a/TAO/performance-tests/Latency/DII/Roundtrip.cpp +++ b/TAO/performance-tests/Latency/DII/Roundtrip.cpp @@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb) } Test::Timestamp -Roundtrip::test_method (Test::Timestamp send_time, - CORBA::Environment &) +Roundtrip::test_method (Test::Timestamp send_time + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return send_time; } void -Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV) +Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.h b/TAO/performance-tests/Latency/DII/Roundtrip.h index 5cc06d55013..5c264f18e1f 100644 --- a/TAO/performance-tests/Latency/DII/Roundtrip.h +++ b/TAO/performance-tests/Latency/DII/Roundtrip.h @@ -25,11 +25,11 @@ public: Roundtrip (CORBA::ORB_ptr orb); // = The skeleton methods - virtual Test::Timestamp test_method (Test::Timestamp send_time, - CORBA::Environment &ACE_TRY_ENV) + virtual Test::Timestamp test_method (Test::Timestamp send_time + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp index e5161b45f1f..482e58c9e40 100644 --- a/TAO/performance-tests/Latency/DII/client.cpp +++ b/TAO/performance-tests/Latency/DII/client.cpp @@ -82,14 +82,14 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -103,14 +103,14 @@ main (int argc, char *argv[]) for (int j = 0; j < 100; ++j) { CORBA::Request_var request = - object->_request ("test_method", ACE_TRY_ENV); + object->_request ("test_method" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ULongLong dummy = 0; request->add_in_arg("send_time") <<= dummy; request->set_return_type (CORBA::_tc_ulonglong); - request->invoke (ACE_TRY_ENV); + request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -122,13 +122,13 @@ main (int argc, char *argv[]) CORBA::ULongLong start = ACE_OS::gethrtime (); CORBA::Request_var request = - object->_request ("test_method", ACE_TRY_ENV); + object->_request ("test_method" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; request->add_in_arg("send_time") <<= start; request->set_return_type (CORBA::_tc_ulonglong); - request->invoke (ACE_TRY_ENV); + request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -159,10 +159,10 @@ main (int argc, char *argv[]) if (do_shutdown) { CORBA::Request_var request = - object->_request ("shutdown", ACE_TRY_ENV); + object->_request ("shutdown" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - request->invoke (ACE_TRY_ENV); + request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp index 641064ea327..5fb1e4454da 100644 --- a/TAO/performance-tests/Latency/DII/server.cpp +++ b/TAO/performance-tests/Latency/DII/server.cpp @@ -64,11 +64,11 @@ main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -77,11 +77,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -94,11 +94,11 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(roundtrip_impl); Test::Roundtrip_var roundtrip = - roundtrip_impl->_this (ACE_TRY_ENV); + roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (roundtrip.in (), ACE_TRY_ENV); + orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it @@ -111,18 +111,18 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |