diff options
| author | huangming <huangminghuang@users.noreply.github.com> | 2003-11-30 05:49:52 +0000 |
|---|---|---|
| committer | huangming <huangminghuang@users.noreply.github.com> | 2003-11-30 05:49:52 +0000 |
| commit | 8048317cb9e9b6f13a56ba53e9ad1c2f9063a3da (patch) | |
| tree | ef42d2bb9bad0e3c3152a16e88ed883d399ab61e | |
| parent | bde1f6d73d8f61df5b905720efd71f81da02ab90 (diff) | |
| download | ATCD-8048317cb9e9b6f13a56ba53e9ad1c2f9063a3da.tar.gz | |
*** empty log message ***
| -rwxr-xr-x | TAO/orbsvcs/FTRT_Event_Service/consumer | 9 | ||||
| -rwxr-xr-x | TAO/orbsvcs/FTRT_Event_Service/supplier | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp | 9 |
4 files changed, 10 insertions, 12 deletions
diff --git a/TAO/orbsvcs/FTRT_Event_Service/consumer b/TAO/orbsvcs/FTRT_Event_Service/consumer index d307eb2a0f5..689b969768d 100755 --- a/TAO/orbsvcs/FTRT_Event_Service/consumer +++ b/TAO/orbsvcs/FTRT_Event_Service/consumer @@ -13,15 +13,12 @@ do EndpointParam="$EndpointParam -ORBEndpoint sciop://";; -td) FTEC_TransactionDepth=$2 shift;; - -d) EndpointParam="$EndpointParam -d $2" - shift;; - -k) EndpointParam="$EndpointParam -k $2" - shift;; - -n) EndpointParam="$EndpointParam -n";; + *) EndpointParam="$EndpointParam $1";; esac shift done cd $TAO_ROOT/orbsvcs/tests/FtRtEvent export FTEC_TransactionDepth -./consumer $EndpointParam $* +echo $EndpointParam +./ftrtec_consumer $EndpointParam diff --git a/TAO/orbsvcs/FTRT_Event_Service/supplier b/TAO/orbsvcs/FTRT_Event_Service/supplier index b4fa054860c..6de8aec2ee2 100755 --- a/TAO/orbsvcs/FTRT_Event_Service/supplier +++ b/TAO/orbsvcs/FTRT_Event_Service/supplier @@ -19,4 +19,4 @@ done cd $TAO_ROOT/orbsvcs/tests/FtRtEvent export FTEC_TransactionDepth -./supplier $EndpointParam +./ftrtec_supplier $EndpointParam diff --git a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp index 3909e3838b5..8974c3c9bf6 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp @@ -49,7 +49,6 @@ FtRtEvent_Test_Base::parse_args(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) break; case 'e': options_.num_events = ACE_OS::atoi(get_opt.opt_arg ()); - options_.num_iterations= INT_MAX; break; case 'i': { @@ -62,7 +61,6 @@ FtRtEvent_Test_Base::parse_args(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) } break; case 'k': - options_.num_events = INT_MAX; options_.num_iterations = atoi(get_opt.opt_arg ()); break; case 'n': diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index c247f0ee8a3..c59b146853a 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp @@ -23,10 +23,10 @@ int PushConsumer_impl::init(CORBA::ORB_ptr orb, const Options& options ACE_ENV_ARG_DECL) { orb_ = orb; - num_iterations_ = options.num_iterations; + num_iterations_ = options.num_iterations ? options.num_iterations : INT_MAX; num_events_to_end_ = options.num_events; - run_times_.assign(options.num_iterations, -1); + run_times_.assign(options.num_iterations+1, -1); RtecEventChannelAdmin::ConsumerQOS qos; qos.is_gateway = 1; @@ -79,6 +79,9 @@ PushConsumer_impl::push (const RtecEventComm::EventSet & event num_events_recevied_ ++; + ACE_DEBUG((LM_DEBUG, " num_events_recevied_ = %d, num_events_to_end_ = %d\n" + , num_events_recevied_, num_events_to_end_)); + if ( num_iterations_ > static_cast<int>(x) && num_events_recevied_ < num_events_to_end_ ) { run_times_[x] = static_cast<int>(elaps/10); @@ -124,7 +127,7 @@ void PushConsumer_impl::output_result() { int lost = 0; - for (int i =0; i < num_iterations_; ++i) + for (int i =0; i < run_times_.size(); ++i) if (run_times_[i] == -1) lost++; else ACE_DEBUG((LM_DEBUG, "%5d received, elapsed time = %d\n",i, run_times_[i])); |