diff options
Diffstat (limited to 'TAO/performance-tests/RTCorba/Thread_Pool/client.cpp')
| -rw-r--r-- | TAO/performance-tests/RTCorba/Thread_Pool/client.cpp | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp index 6e0264cf576..abd88699003 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp @@ -244,14 +244,14 @@ start_synchronization (test_ptr test, ACE_TRY_NEW_ENV { for (CORBA::ULong i = 0; - i < synchronization_iterations; - ++i) - { - test->method (work, - prime_number, - ACE_TRY_ENV); - ACE_TRY_CHECK; - } + i < synchronization_iterations; + ++i) + { + test->method (work, + prime_number + TAO_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + } } ACE_CATCHANY { @@ -358,7 +358,7 @@ max_throughput (test_ptr test, ACE_TRY_NEW_ENV { CORBA_priority = - current->the_priority (ACE_TRY_ENV); + current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Boolean result = @@ -386,8 +386,8 @@ max_throughput (test_ptr test, break; test->method (work, - prime_number, - ACE_TRY_ENV); + prime_number + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ++calls_made; @@ -430,9 +430,9 @@ public: int svc (void); ACE_hrtime_t deadline_for_current_call (CORBA::ULong i); - void reset_priority (CORBA::Environment &ACE_TRY_ENV); + void reset_priority (TAO_ENV_SINGLE_ARG_DECL); void print_stats (ACE_hrtime_t test_end); - int setup (CORBA::Environment &ACE_TRY_ENV); + int setup (TAO_ENV_SINGLE_ARG_DECL); void missed_start_deadline (CORBA::ULong invocation); void missed_end_deadline (CORBA::ULong invocation); @@ -483,18 +483,18 @@ Paced_Worker::Paced_Worker (ACE_Thread_Manager &thread_manager, } void -Paced_Worker::reset_priority (CORBA::Environment &ACE_TRY_ENV) +Paced_Worker::reset_priority (TAO_ENV_SINGLE_ARG_DECL) { if (set_priority) { - this->current_->the_priority (this->priority_, - ACE_TRY_ENV); + this->current_->the_priority (this->priority_ + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } else { - this->current_->the_priority (continuous_worker_priority, - ACE_TRY_ENV); + this->current_->the_priority (continuous_worker_priority + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -600,16 +600,16 @@ Paced_Worker::print_stats (ACE_hrtime_t test_end) } int -Paced_Worker::setup (CORBA::Environment &ACE_TRY_ENV) +Paced_Worker::setup (TAO_ENV_SINGLE_ARG_DECL) { if (priority_setting == AFTER_THREAD_CREATION) { - this->reset_priority (ACE_TRY_ENV); + this->reset_priority (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } this->CORBA_priority_ = - this->current_->the_priority (ACE_TRY_ENV); + this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Boolean result = @@ -647,7 +647,7 @@ Paced_Worker::svc (void) ACE_TRY_NEW_ENV { int result = - this->setup (ACE_TRY_ENV); + this->setup (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -670,8 +670,8 @@ Paced_Worker::svc (void) } this->test_->method (work, - prime_number, - ACE_TRY_ENV); + prime_number + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t time_after_call = @@ -725,7 +725,7 @@ public: int svc (void); void print_stats (ACE_Sample_History &history, ACE_hrtime_t test_end); - int setup (CORBA::Environment &ACE_TRY_ENV); + int setup (TAO_ENV_SINGLE_ARG_DECL); void print_collective_stats (void); test_var test_; @@ -827,17 +827,17 @@ Continuous_Worker::print_collective_stats (void) } int -Continuous_Worker::setup (CORBA::Environment &ACE_TRY_ENV) +Continuous_Worker::setup (TAO_ENV_SINGLE_ARG_DECL) { if (priority_setting == AFTER_THREAD_CREATION) { - this->current_->the_priority (continuous_worker_priority, - ACE_TRY_ENV); + this->current_->the_priority (continuous_worker_priority + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } this->CORBA_priority_ = - this->current_->the_priority (ACE_TRY_ENV); + this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CORBA::Boolean result = @@ -862,7 +862,7 @@ Continuous_Worker::svc (void) ACE_Sample_History history (this->iterations_); int result = - this->setup (ACE_TRY_ENV); + this->setup (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (result != 0) @@ -875,8 +875,8 @@ Continuous_Worker::svc (void) ACE_hrtime_t start = ACE_OS::gethrtime (); this->test_->method (work, - prime_number, - ACE_TRY_ENV); + prime_number + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_hrtime_t end = ACE_OS::gethrtime (); @@ -911,7 +911,7 @@ 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; int result = @@ -922,31 +922,31 @@ main (int argc, char *argv[]) fudge_priorities (orb.in ()); 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_var test = - test::_narrow (object.in (), ACE_TRY_ENV); + test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = - orb->resolve_initial_references ("RTCurrent", - ACE_TRY_ENV); + orb->resolve_initial_references ("RTCurrent" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in (), - ACE_TRY_ENV); + RTCORBA::Current::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; object = - orb->resolve_initial_references ("PriorityMappingManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("PriorityMappingManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var mapping_manager = - RTCORBA::PriorityMappingManager::_narrow (object.in (), - ACE_TRY_ENV); + RTCORBA::PriorityMappingManager::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMapping &priority_mapping = @@ -1145,7 +1145,7 @@ main (int argc, char *argv[]) if (shutdown_server) { - test->shutdown (ACE_TRY_ENV); + test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } |