http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1351 - use monotonic timers where possible

1 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/IceGrid/WaitQueue.cpp b/cpp/src/IceGrid/WaitQueue.cpp
index 06e18766558..93c294d0018 100644
--- a/cpp/src/IceGrid/WaitQueue.cpp
+++ b/cpp/src/IceGrid/WaitQueue.cpp
@@ -61,7 +61,7 @@ WaitQueue::run()
             while(!_waitQueue.empty() && !_destroyed)
             {
                 WaitItemPtr item = _waitQueue.front();              
-                if(item->getExpirationTime() <= IceUtil::Time::now())
+                if(item->getExpirationTime() <= IceUtil::Time::now(IceUtil::Time::Monotonic))
                 {
                     expired.push_back(item);
                     _waitQueue.pop_front();     
@@ -76,7 +76,7 @@ WaitQueue::run()
                     // Wait until the next item expire or a notification. Note: in any case we 
                     // get out of this loop to get a chance to execute the work queue.
                     //
-                    timedWait(item->getExpirationTime() - IceUtil::Time::now());                            
+                    timedWait(item->getExpirationTime() - IceUtil::Time::now(IceUtil::Time::Monotonic));
                 }
             }
         }
@@ -140,7 +140,7 @@ WaitQueue::add(const WaitItemPtr& item, const IceUtil::Time& wait)
     //
     bool notifyThread = _waitQueue.empty();
 
-    IceUtil::Time expire = IceUtil::Time::now() + wait;
+    IceUtil::Time expire = IceUtil::Time::now(IceUtil::Time::Monotonic) + wait;
     item->setExpirationTime(expire);
     
     list<WaitItemPtr>::iterator p = _waitQueue.begin();