From fe11aee4361ca77c77dd63c6137a0c5185c59ccc Mon Sep 17 00:00:00 2001 From: irfan Date: Wed, 5 Sep 2001 23:10:46 +0000 Subject: Minor changes --- .../RTCorba/Thread_Pool/client.cpp | 56 ++++++++++++---------- .../RTCorba/Thread_Pool/run_test.pl | 2 +- .../RTCorba/Thread_Pool/server.cpp | 7 +-- 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp index 87370ef41a7..38595f56f19 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp @@ -19,11 +19,11 @@ static int shutdown_server = 0; static int do_dump_history = 0; static ACE_UINT32 gsf = 0; static const char *rates_file = "rates"; -static size_t continuous_workers = 0; +static CORBA::ULong continuous_workers = 0; static int done = 0; -static time_for_test = 10; -static work = 10; -static size_t max_throughput_timeout = 5; +static CORBA::ULong time_for_test = 10; +static CORBA::ULong work = 10; +static CORBA::ULong max_throughput_timeout = 5; int parse_args (int argc, char *argv[]) @@ -82,12 +82,12 @@ parse_args (int argc, char *argv[]) return 0; } -typedef ACE_Array_Base Rates; +typedef ACE_Array_Base Rates; int get_rates (const char *file_name, Rates &rates, - size_t &lowest_rate) + CORBA::ULong &lowest_rate) { // // Read rates from a file. @@ -116,7 +116,7 @@ get_rates (const char *file_name, return 0; } - size_t length = + CORBA::ULong length = reader.replaced () + 1; rates.size (length); @@ -128,7 +128,7 @@ get_rates (const char *file_name, int result = 1; char* working_string = string; lowest_rate = ACE_UINT32_MAX; - for (size_t i = 0; i < length; ++i) + for (CORBA::ULong i = 0; i < length; ++i) { result = ::sscanf (working_string, "%d", @@ -169,8 +169,8 @@ class Paced_Worker : public: Paced_Worker (ACE_Thread_Manager &thread_manager, test_ptr test, - size_t rate, - size_t iterations, + CORBA::ULong rate, + CORBA::ULong iterations, CORBA::Short priority, RTCORBA::Current_ptr current, RTCORBA::PriorityMapping &priority_mapping, @@ -178,7 +178,7 @@ public: int svc (void); - ACE_Time_Value deadline_for_current_call (size_t i); + ACE_Time_Value deadline_for_current_call (CORBA::ULong i); test_var test_; int rate_; @@ -193,8 +193,8 @@ public: Paced_Worker::Paced_Worker (ACE_Thread_Manager &thread_manager, test_ptr test, - size_t rate, - size_t iterations, + CORBA::ULong rate, + CORBA::ULong iterations, CORBA::Short priority, RTCORBA::Current_ptr current, RTCORBA::PriorityMapping &priority_mapping, @@ -214,7 +214,7 @@ Paced_Worker::Paced_Worker (ACE_Thread_Manager &thread_manager, } ACE_Time_Value -Paced_Worker::deadline_for_current_call (size_t i) +Paced_Worker::deadline_for_current_call (CORBA::ULong i) { ACE_Time_Value deadline_for_current_call = this->interval_between_calls_; @@ -229,7 +229,7 @@ Paced_Worker::deadline_for_current_call (size_t i) int Paced_Worker::svc (void) { - size_t deadlines_missed = 0; + CORBA::ULong deadlines_missed = 0; CORBA::Short native_priority = 0; ACE_TRY_NEW_ENV @@ -253,7 +253,7 @@ Paced_Worker::svc (void) ACE_hrtime_t test_start = ACE_OS::gethrtime (); - for (size_t i = 0; + for (CORBA::ULong i = 0; i != this->history_.max_samples (); ++i) { @@ -341,20 +341,20 @@ class Continuous_Worker : { public: Continuous_Worker (test_ptr test, - size_t iterations, + CORBA::ULong iterations, RTCORBA::Current_ptr current, ACE_SYNCH_MUTEX &output_lock); int svc (void); test_var test_; - size_t iterations_; + CORBA::ULong iterations_; ACE_SYNCH_MUTEX &output_lock_; RTCORBA::Current_var current_; }; Continuous_Worker::Continuous_Worker (test_ptr test, - size_t iterations, + CORBA::ULong iterations, RTCORBA::Current_ptr current, ACE_SYNCH_MUTEX &output_lock) : test_ (test::_duplicate (test)), @@ -378,7 +378,7 @@ Continuous_Worker::svc (void) ACE_hrtime_t test_start = ACE_OS::gethrtime (); - for (size_t i = 0; + for (CORBA::ULong i = 0; i != history.max_samples () && !done; ++i) { @@ -432,9 +432,9 @@ Continuous_Worker::svc (void) int max_throughput (test_ptr test, - size_t &max_rate) + CORBA::ULong &max_rate) { - size_t calls_made = 0; + CORBA::ULong calls_made = 0; ACE_TRY_NEW_ENV { @@ -528,7 +528,7 @@ main (int argc, char *argv[]) *mapping_manager->mapping (); Rates rates; - size_t lowest_rate = 0; + CORBA::ULong lowest_rate = 0; result = get_rates (rates_file, @@ -537,7 +537,7 @@ main (int argc, char *argv[]) if (result != 0) return result; - size_t max_rate = 0; + CORBA::ULong max_rate = 0; result = max_throughput (test.in (), max_rate); @@ -549,7 +549,7 @@ main (int argc, char *argv[]) ACE_Thread_Manager paced_workers_manager; - size_t i = 0; + CORBA::ULong i = 0; Paced_Worker **paced_workers = new Paced_Worker *[rates.size ()]; @@ -635,3 +635,9 @@ main (int argc, char *argv[]) return 0; } + +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class ACE_Array_Base; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate ACE_Array_Base +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/run_test.pl b/TAO/performance-tests/RTCorba/Thread_Pool/run_test.pl index ac33feba97e..b8745d81061 100755 --- a/TAO/performance-tests/RTCorba/Thread_Pool/run_test.pl +++ b/TAO/performance-tests/RTCorba/Thread_Pool/run_test.pl @@ -16,7 +16,7 @@ unlink $iorfile; $SV = new PerlACE::Process ("server"); -$CL = new PerlACE::Process ("client", "-x -i $iterations"); +$CL = new PerlACE::Process ("client", "-x"); $SV->Spawn (); diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp index f641fa33c6b..5148af97df9 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp @@ -1,11 +1,12 @@ // $Id$ -#include "testS.h" #include "ace/Get_Opt.h" -#include "tao/PortableServer/PortableServer.h" -#include "tao/debug.h" #include "ace/Stats.h" #include "ace/Sample_History.h" +#include "tao/debug.h" +#include "tao/PortableServer/PortableServer.h" +#include "tao/RTCORBA/RTCORBA.h" +#include "testS.h" ACE_RCSID(Thread_Pools, server, "$Id$") -- cgit v1.2.1