Disallow negative timeouts for Timer::tick

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

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index 9471463216206b701d285562bb41e0af1901fafc..e0af57cc78fcc41363632e169e33a8219653e9f1 100644 (file)
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -1,11 +1,5 @@
-/* $Id$
-
-This file is part of libmspcore     
-Copyright © 2006, 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <algorithm>
+#include <msp/core/raii.h>
 #include "timer.h"
 #include "utils.h"
 
@@ -14,6 +8,11 @@ using namespace std;
 namespace Msp {
 namespace Time {
 
+Timer::Timer():
+       sem(1),
+       blocking(false)
+{ }
+
 Timer::~Timer()
 {
        for(vector<SlotProxy>::iterator i=slots.begin(); i!=slots.end(); ++i)
@@ -22,24 +21,23 @@ Timer::~Timer()
 
 Timer::Slot &Timer::add(const TimeDelta &td)
 {
-       Slot *s=new Slot(td);
-       mutex.lock();
+       Slot *s = new Slot(td);
+       MutexLock l(mutex);
        slots.push_back(s);
        push_heap(slots.begin(), slots.end());
-       mutex.unlock();
-       sem.signal();
+       if(blocking)
+               sem.signal();
        return *s;
 }
 
 Timer::Slot &Timer::add(const TimeStamp &ts)
 {
-       Slot *s=new Slot(ts);
-       {
-               MutexLock l(mutex);
-               slots.push_back(s);
-               push_heap(slots.begin(), slots.end());
-       }
-       sem.signal();
+       Slot *s = new Slot(ts);
+       MutexLock l(mutex);
+       slots.push_back(s);
+       push_heap(slots.begin(), slots.end());
+       if(blocking)
+               sem.signal();
        return *s;
 }
 
@@ -58,26 +56,60 @@ void Timer::cancel(Slot &slot)
 
 void Timer::tick(bool block)
 {
-       Slot *next=0;
+       if(block)
+               tick();
+       else
+               tick(zero);
+}
+
+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);
                while(1)
                {
-                       if(slots.empty())
+                       TimeStamp stamp;
+                       TimeStamp t = now();
+                       if(!slots.empty())
                        {
-                               if(block)
-                                       sem.wait();
-                               else
-                                       return;
+                               next = slots.begin()->slot;
+                               stamp = next->get_timeout();
+                               if(stamp<=t)
+                                       break;
                        }
 
-                       next=slots.begin()->slot;
-                       const TimeStamp &stamp=next->get_timeout();
-                       const TimeStamp t=now();
-                       if(stamp<=t)
-                               break;
-                       else if(block)
-                               sem.wait(stamp-t);
+                       if(timeout && (!deadline || t<deadline))
+                       {
+                               SetFlag setf(blocking);
+                               mutex.unlock();
+                               if(stamp && (!deadline || stamp<deadline))
+                                       sem.wait(stamp-t);
+                               else if(deadline)
+                                       sem.wait(deadline-t);
+                               else
+                                       sem.wait();
+                               mutex.lock();
+                               // The slots may have changed while waiting so check again
+                               continue;
+                       }
                        else
                                return;
                }
@@ -125,7 +157,7 @@ bool Timer::Slot::increment()
 {
        if(!interval)
                return false;
-       timeout+=interval;
+       timeout += interval;
        return true;
 }