Fri Dec 2 10:07:48 UTC 2011 Martin Corino <mcorino@remedy.nl>

        * ace/Countdown_Time.h:
        * ace/Countdown_Time.inl:
        * ace/Countdown_Time.cpp:
        * ace/Timer_Queue_T.h:
        * ace/Timer_Queue_T.inl:
        
          Reverting timer changes to be replaced by better and more
          flexible changes after the coming release.


        * tao/Leader_Follower.cpp:
        * tao/Messaging/Messaging_Queueing_Strategies.h:
        * tao/Messaging/Messaging_Queueing_Strategies.cpp:
        * tao/ORB_Core.cpp:
        * tao/Transport.cpp:
        * tao/params.h:
        * tao/params.inl:
        * tao/params.cpp:

          Reverting timer changes to be replaced by better and more
          flexible changes after the coming release.

2 files changed, 3 insertions, 12 deletions

diff --git a/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp b/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp
index 05748654ed8..90c0e441f7d 100644
--- a/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp
+++ b/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp
@@ -3,13 +3,10 @@
 #include "tao/Messaging/Messaging_Queueing_Strategies.h"
 #include "tao/Messaging/Buffering_Constraint_Policy.h"
 #include "tao/Stub.h"
-#include "tao/ORB_Core.h"
 #include "tao/debug.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_time.h"
-#include "ace/Reactor.h"
-#include "ace/Timer_Queue.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -84,8 +81,7 @@ namespace TAO
         constraints_reached = true;
       }
 
-    if (this->timer_check (stub,
-                           buffering_constraint,
+    if (this->timer_check (buffering_constraint,
                            current_deadline,
                            set_timer,
                            new_deadline))
@@ -98,7 +94,6 @@ namespace TAO
 
   bool
   Eager_Transport_Queueing_Strategy::timer_check (
-    TAO_Stub *stub,
     const TAO::BufferingConstraint &buffering_constraint,
     const ACE_Time_Value &current_deadline,
     bool &set_timer,
@@ -113,9 +108,7 @@ namespace TAO
       }
 
     // Compute the next deadline...
-    ACE_Reactor * const reactor = stub->orb_core ()->reactor ();
-    ACE_Time_Value const now =
-        reactor->timer_queue ()->gettimeofday ();
+    ACE_Time_Value const now = ACE_OS::gettimeofday ();
     ACE_Time_Value timeout =
       this->time_conversion (buffering_constraint.timeout);
     new_deadline = now + timeout;
diff --git a/TAO/tao/Messaging/Messaging_Queueing_Strategies.h b/TAO/tao/Messaging/Messaging_Queueing_Strategies.h
index 2bf7c425b84..9bceb8518a6 100644
--- a/TAO/tao/Messaging/Messaging_Queueing_Strategies.h
+++ b/TAO/tao/Messaging/Messaging_Queueing_Strategies.h
@@ -62,7 +62,6 @@ namespace TAO
     /// Check if the buffering constraint includes any timeouts and
     /// compute the right timeout interval if needed.
     /**
-     * @param stub
      * @param buffering_constraint The constraints defined by the
      *        application
      * @param current_deadline The current deadline
@@ -74,8 +73,7 @@ namespace TAO
      *         returns false then flushing may need to be delayed, use @c
      *         set_timer and
      */
-    bool timer_check (TAO_Stub *stub,
-                      const TAO::BufferingConstraint &buffering_constraint,
+    bool timer_check (const TAO::BufferingConstraint &buffering_constraint,
                       const ACE_Time_Value &current_deadline,
                       bool &set_timer,
                       ACE_Time_Value &new_deadline) const;