diff options
| author | huangming <huangminghuang@users.noreply.github.com> | 2003-12-03 23:27:20 +0000 |
|---|---|---|
| committer | huangming <huangminghuang@users.noreply.github.com> | 2003-12-03 23:27:20 +0000 |
| commit | d78e9b99f54bb8562c93446310e86d469da14758 (patch) | |
| tree | 6742ab5f8c22665e8abb2dfcf9864b96c57cbac9 | |
| parent | 9370da3b9ed481f67ac00c65d0d860852b20fef5 (diff) | |
| download | ATCD-d78e9b99f54bb8562c93446310e86d469da14758.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp | 21 |
2 files changed, 17 insertions, 11 deletions
diff --git a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp index c5561fca804..ded6480cd47 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp @@ -37,7 +37,7 @@ FtRtEvent_Test_Base::~FtRtEvent_Test_Base() int FtRtEvent_Test_Base::parse_args(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) { - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("d:e:f:hi:k:np:?")); + ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT("d:e:f:hi:k:np:r?")); int opt; while ((opt = get_opt ()) != EOF) @@ -72,6 +72,9 @@ FtRtEvent_Test_Base::parse_args(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL) case 'p': options_.proxy_consumer_file = get_opt.opt_arg (); break; + case 'r': + RT_Task::enable(); + break; case 'h': case '?': ACE_DEBUG((LM_DEBUG, @@ -134,8 +137,6 @@ FtRtEvent_Test_Base::get_event_channel(ACE_ENV_SINGLE_ARG_DECL) int FtRtEvent_Test_Base::run(int argc, ACE_TCHAR** argv) { - RT_Task::set_current(); - ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { orb_ = CORBA::ORB_init(argc, argv, "" diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index 1e387372ad9..c0eb64d95dd 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp @@ -26,7 +26,7 @@ int PushConsumer_impl::init(CORBA::ORB_ptr orb, num_iterations_ = options.num_iterations ? options.num_iterations : INT_MAX; num_events_to_end_ = options.num_events; - run_times_.assign(options.num_iterations+1, -1); + run_times_.assign(options.num_iterations, -1); RtecEventChannelAdmin::ConsumerQOS qos; qos.is_gateway = 1; @@ -79,11 +79,12 @@ PushConsumer_impl::push (const RtecEventComm::EventSet & event num_events_recevied_ ++; - if ( num_iterations_ > static_cast<int>(x) && - num_events_recevied_ < num_events_to_end_ ) { - run_times_[x] = static_cast<int>(elaps/10); - TAO_FTRTEC::Log(3, "received event %d\n", x); - } + if ( num_iterations_ > static_cast<int>(x) && + num_events_recevied_ < num_events_to_end_ ) { + if (x < run_times_.size()) + run_times_[x] = static_cast<int>(elaps/10); + TAO_FTRTEC::Log(3, "received event %d\n", x); + } else { ACE_TRY { supplier_->disconnect_push_supplier(ACE_ENV_SINGLE_ARG_PARAMETER); @@ -124,10 +125,14 @@ void PushConsumer_impl::output_result() { size_t lost = 0; + size_t first_event = UINT_MAX; for (size_t i =0; i < run_times_.size(); ++i) if (run_times_[i] == -1) lost++; - else + else { + if (first_event > i) first_event = i; ACE_DEBUG((LM_DEBUG, "%5d received, elapsed time = %d\n",i, run_times_[i])); - ACE_DEBUG((LM_DEBUG, "%d events lost out of %d events\n", lost, num_iterations_));; + } + + ACE_DEBUG((LM_DEBUG, "%d events lost out of %d events, %d events lost in the middle\n", lost, num_iterations_, lost-first_event));; } |