diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
commit | 63165b00e2d667e39e15cf084128d94a563d484e (patch) | |
tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/performance-tests/Thread_Pool_Latency | |
parent | 6579bccb3a3f22f882ef908ad5f7e1a65b00b133 (diff) | |
download | ATCD-63165b00e2d667e39e15cf084128d94a563d484e.tar.gz |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/performance-tests/Thread_Pool_Latency')
7 files changed, 27 insertions, 27 deletions
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp index 8f88421e8a0..97f1ef0a50b 100644 --- a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp +++ b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp @@ -15,17 +15,17 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip, int Client_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { - this->validate_connection (ACE_TRY_ENV); + this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (int i = 0; i != this->niterations_; ++i) { CORBA::ULongLong start = ACE_OS::gethrtime (); - (void) this->roundtrip_->test_method (start, ACE_TRY_ENV); + (void) this->roundtrip_->test_method (start TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -50,14 +50,14 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals, } void -Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV) +Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL) { CORBA::ULongLong dummy = 0; for (int i = 0; i != 100; ++i) { ACE_TRY { - (void) this->roundtrip_->test_method (dummy, ACE_TRY_ENV); + (void) this->roundtrip_->test_method (dummy TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h index 1655e0f8847..a75172e8161 100644 --- a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h +++ b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h @@ -29,7 +29,7 @@ public: private: /// Make sure that the current thread has a connection available. - void validate_connection (CORBA::Environment &ACE_TRY_ENV); + void validate_connection (TAO_ENV_SINGLE_ARG_DECL); private: /// The object reference used for this test diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp index 01a2dce839d..0337e54c34f 100644 --- a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp +++ b/TAO/performance-tests/Thread_Pool_Latency/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/Thread_Pool_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h index 5cc06d55013..5c264f18e1f 100644 --- a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h +++ b/TAO/performance-tests/Thread_Pool_Latency/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/Thread_Pool_Latency/Worker_Thread.cpp b/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp index bcd94b6d1f7..50a9ba7e898 100644 --- a/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp +++ b/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp @@ -16,7 +16,7 @@ Worker_Thread::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (ACE_TRY_ENV); + this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; diff --git a/TAO/performance-tests/Thread_Pool_Latency/client.cpp b/TAO/performance-tests/Thread_Pool_Latency/client.cpp index a522c394b8c..f3ef1a10bd1 100644 --- a/TAO/performance-tests/Thread_Pool_Latency/client.cpp +++ b/TAO/performance-tests/Thread_Pool_Latency/client.cpp @@ -76,18 +76,18 @@ 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; Test::Roundtrip_var roundtrip = - Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV); + Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (roundtrip.in ())) @@ -134,7 +134,7 @@ main (int argc, char *argv[]) if (do_shutdown) { - roundtrip->shutdown (ACE_TRY_ENV); + roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } diff --git a/TAO/performance-tests/Thread_Pool_Latency/server.cpp b/TAO/performance-tests/Thread_Pool_Latency/server.cpp index 503d226a4c7..7090cfdf18e 100644 --- a/TAO/performance-tests/Thread_Pool_Latency/server.cpp +++ b/TAO/performance-tests/Thread_Pool_Latency/server.cpp @@ -65,11 +65,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 ())) @@ -78,11 +78,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) @@ -95,11 +95,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 @@ -112,7 +112,7 @@ 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; Worker_Thread worker (orb.in ()); @@ -122,10 +122,10 @@ main (int argc, char *argv[]) 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 |