diff options
4 files changed, 31 insertions, 10 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 2195f50d7fd..8989f815216 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,11 @@ +2003-08-01 Diego Sevilla <dsevilla@ditec.um.es> + + * performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp: + Small bug fix. + + * performance-tests/Benchmark/Benchmark.idl: Added missing + Controller interface. + 2003-07-31 Diego Sevilla <dsevilla@ditec.um.es> * performance-tests/Benchmark/Benchmark.idl: diff --git a/TAO/CIAO/performance-tests/Benchmark/Benchmark.idl b/TAO/CIAO/performance-tests/Benchmark/Benchmark.idl index ef2276d314e..867feff4407 100644 --- a/TAO/CIAO/performance-tests/Benchmark/Benchmark.idl +++ b/TAO/CIAO/performance-tests/Benchmark/Benchmark.idl @@ -33,6 +33,17 @@ module Benchmark }; + /** + * @interface Controller + * + * This interface is used to start the tests. + */ + interface Controller + { + /// Start the test + void start (); + }; + }; #endif /*CIAO_BENCHMARK_IDL*/ diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp index 05a7100a83b..5c97bdeae95 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.cpp @@ -1,10 +1,12 @@ -p// $Id$ - -#include "RoundTripClient_exec.h" +// $Id$ + #include "ace/Stats.h" #include "ace/Sample_History.h" #include "ace/High_Res_Timer.h" +#include "RoundTripClient_exec.h" + + const int niterations = 100000; //Default no of iterations //================================================================= @@ -50,13 +52,13 @@ MyImpl::RoundTripClient_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -MyImpl::RoundTripClient_exec_i::start () +MyImpl::RoundTripClient_exec_i::start () ACE_THROW_SPEC ((CORBA::SystemException)) { ///////////// Start test ///////////////////////////////////////// - + // Let's try to start tests from here... - Benchmark::LatencyTest_var lt = + Benchmark::LatencyTest_var lt = context_->get_connection_latency(ACE_ENV_ARG_PARAMETER); ACE_CHECK; @@ -82,7 +84,7 @@ MyImpl::RoundTripClient_exec_i::start () (void) lt->makeCall (test ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + ACE_hrtime_t now = ACE_OS::gethrtime (); history.sample (now - start); } @@ -98,11 +100,11 @@ MyImpl::RoundTripClient_exec_i::start () ACE_Basic_Stats stats; history.collect_basic_stats (stats); stats.dump_results ("Total", gsf); - + ACE_Throughput_Stats::dump_throughput ("Total", gsf, test_end - test_start, stats.samples_count ()); - + } ::Benchmark::CCM_Controller_ptr diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h index 4268e5376db..6969ec90e52 100644 --- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h +++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient_exec.h @@ -59,7 +59,7 @@ namespace MyImpl virtual ::Benchmark::CCM_Controller_ptr get_controller (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)); + ACE_THROW_SPEC ((CORBA::SystemException)); virtual void start (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); |