Remove deprecated things

[libs/core.git] / source / time / timer.cpp

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index 7c9567ecfecccafe826f8d1fcd52d0bb82d6f899..c15cd28eaed1752f6cc3c904ba57d2171dd030c5 100644 (file)
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -54,8 +54,25 @@ void Timer::cancel(Slot &slot)
                }
 }
 
-void Timer::tick(bool block)
+void Timer::tick()
 {
+       do_tick(-sec);
+}
+
+void Timer::tick(const TimeDelta &timeout)
+{
+       if(timeout<zero)
+               throw invalid_argument("Timer::tick");
+
+       do_tick(timeout);
+}
+
+void Timer::do_tick(const TimeDelta &timeout)
+{
+       TimeStamp deadline;
+       if(timeout>=zero)
+               deadline = now()+timeout;
+
        Slot *next = 0;
        {
                MutexLock l(mutex);
@@ -71,12 +88,14 @@ void Timer::tick(bool block)
                                        break;
                        }
 
-                       if(block)
+                       if(timeout && (!deadline || t<deadline))
                        {
                                SetFlag setf(blocking);
                                mutex.unlock();
-                               if(stamp)
+                               if(stamp && (!deadline || stamp<deadline))
                                        sem.wait(stamp-t);
+                               else if(deadline)
+                                       sem.wait(deadline-t);
                                else
                                        sem.wait();
                                mutex.lock();