diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-11-29 15:52:02 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-11-29 15:52:02 +0000 |
| commit | 49c98734fe736bc83d4be0681cc7231307891dba (patch) | |
| tree | 085ff769176c170b8d86f436e0b9bf4dd116e792 /TAO/tao/Transport.cpp | |
| parent | e4c221321ec7715258af5139b0619e13d9d9b06f (diff) | |
| download | ATCD-49c98734fe736bc83d4be0681cc7231307891dba.tar.gz | |
Tue Nov 29 15:50:06 UTC 2011 Martin Corino <mcorino@remedy.nl>
* ace/Timer_Queue_T.h:
* ace/Timer_Queue_T.inl:
Added get_timer_method() to be able reuse timer method
setting.
* ace/Countdown_Time.h:
* ace/Countdown_Time.inl:
* ace/Countdown_Time.cpp:
Added option to use application defined timer like
timer queue.
* tao/ORB_Core.cpp:
* tao/params.h:
* tao/params.inl:
* tao/params.cpp:
Added -ORBUseHighresTimer ORB parameter switch to specifiy
if the ORB should use the HR timer for the reactor timer queue
and related objects (like countdowns).
* tao/Transport.cpp:
* tao/Leader_Follower.cpp:
* tao/Messaging/Messaging_Queueing_Strategies.h:
* tao/Messaging/Messaging_Queueing_Strategies.cpp:
Changes to support the new UseHighresTimer switch.
Diffstat (limited to 'TAO/tao/Transport.cpp')
| -rw-r--r-- | TAO/tao/Transport.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index ce7224a2287..3b5a6b6e55b 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -29,6 +29,7 @@ #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_stdio.h" #include "ace/Reactor.h" +#include "ace/Timer_Queue.h" #include "ace/os_include/sys/os_uio.h" #include "ace/High_Res_Timer.h" #include "ace/Countdown_Time.h" @@ -1325,7 +1326,8 @@ TAO_Transport::check_buffering_constraints_i (TAO_Stub *stub, bool &must_flush) ACE_Event_Handler *eh = this->event_handler_i (); ACE_Reactor * const reactor = eh->reactor (); this->current_deadline_ = new_deadline; - ACE_Time_Value delay = new_deadline - ACE_OS::gettimeofday (); + ACE_Time_Value delay = + new_deadline - reactor->timer_queue ()->gettimeofday (); if (this->flush_timer_pending ()) { |