diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event/Performance/Latency.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Event/Performance/Latency.cpp | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 7b202b6a323..37fab174375 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -2,7 +2,6 @@ #include "Latency.h" #include "orbsvcs/Event_Service_Constants.h" -#include "tao/Strategies/advanced_resource.h" #include "tao/PortableServer/PortableServer.h" #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" @@ -50,7 +49,7 @@ main (int argc, char *argv []) CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); ACE_TRY_CHECK; -#if (TAO_HAS_CORBA_MESSAGING == 1) +#if (TAO_HAS_MESSAGING == 1) CORBA::Object_var manager_object = orb->resolve_initial_references ("ORBPolicyManager", ACE_TRY_ENV); @@ -82,9 +81,7 @@ main (int argc, char *argv []) #endif /* TAO_HAS_MESSAGING */ CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); - ACE_TRY_CHECK; - + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), @@ -201,24 +198,20 @@ main (int argc, char *argv []) task.activate (); - ACE_hrtime_t start = ACE_OS::gethrtime (); while (!task.done () || !consumer.done ()) { - ACE_Time_Value tv (1, 0); + ACE_Time_Value tv (10, 0); //0, 10000); orb->run (tv, ACE_TRY_ENV); ACE_TRY_CHECK; } - ACE_hrtime_t end = ACE_OS::gethrtime (); ACE_Thread_Manager::instance ()->wait (); // Calibrate the high resolution timer *before* starting the // test. - ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ....")); ACE_High_Res_Timer::calibrate (); ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); - ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf)); if (do_dump_history) { history.dump_samples ("HISTORY", gsf); @@ -228,14 +221,6 @@ main (int argc, char *argv []) history.collect_basic_stats (stats); stats.dump_results ("Latency", gsf); - ACE_hrtime_t elapsed_microseconds = (end - start) / gsf; - double elapsed_seconds = - ACE_CU64_TO_CU32(elapsed_microseconds) / 1000000.0; - double throughput = - double(iterations) / elapsed_seconds; - - ACE_DEBUG ((LM_DEBUG, "Throughtput: %f\n", throughput)); - proxy_supplier->disconnect_push_supplier (ACE_TRY_ENV); ACE_TRY_CHECK; @@ -331,12 +316,6 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events, ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); this->history_->sample (now - creation); - if (this->remaining_messages_ % 1000 == 0) - { - ACE_DEBUG ((LM_DEBUG, "Only %d messages to go\n", - this->remaining_messages_)); - } - this->remaining_messages_--; } @@ -384,7 +363,6 @@ Task::svc (void) event[0].header.type = ACE_ES_EVENT_UNDEFINED; event[0].header.source = 1; event[0].header.ttl = 1; - event[0].data.payload.length(1024); for (;;) { |