Fix Timer to use is Semaphore correctly

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

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index 9fc82f57e872bf0b0c1f1dcc3ee8f974003eafd5..f26900b8d4a589769c707b59513de6aa2d8dc129 100644 (file)
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -1,9 +1,4 @@
-/*
-This file is part of libmspcore     
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <algorithm>
 #include "timer.h"
 #include "utils.h"
 
@@ -13,66 +8,114 @@ namespace Msp {
 namespace Time {
 
 Timer::Timer():
-       slots(slot_compare)
+       sem(1),
+       blocking(false)
 { }
 
 Timer::~Timer()
 {
-       while(!slots.empty())
-       {
-               delete slots.top();
-               slots.pop();
-       }
+       for(vector<SlotProxy>::iterator i=slots.begin(); i!=slots.end(); ++i)
+               delete i->slot;
 }
 
 Timer::Slot &Timer::add(const TimeDelta &td)
 {
-       Slot *s=new Slot(td);
-       mutex.lock();
-       slots.push(s);
-       mutex.unlock();
-       sem.signal();
+       Slot *s = new Slot(td);
+       MutexLock l(mutex);
+       slots.push_back(s);
+       push_heap(slots.begin(), slots.end());
+       if(blocking)
+               sem.signal();
        return *s;
 }
 
 Timer::Slot &Timer::add(const TimeStamp &ts)
 {
-       Slot *s=new Slot(ts);
-       mutex.lock();
-       slots.push(s);
-       mutex.unlock();
-       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;
 }
 
+void Timer::cancel(Slot &slot)
+{
+       MutexLock l(mutex);
+       for(vector<SlotProxy>::iterator i=slots.begin(); i!=slots.end(); ++i)
+               if(i->slot==&slot)
+               {
+                       delete i->slot;
+                       slots.erase(i);
+                       make_heap(slots.begin(), slots.end());
+                       return;
+               }
+}
+
 void Timer::tick(bool block)
 {
-       if(slots.empty())
+       Slot *next = 0;
        {
-               if(block)
-                       sem.wait();
-               return;
+               MutexLock l(mutex);
+               while(1)
+               {
+                       if(slots.empty())
+                       {
+                               if(block)
+                               {
+                                       blocking = true;
+                                       mutex.unlock();
+                                       sem.wait();
+                                       mutex.lock();
+                               }
+                               else
+                                       return;
+                       }
+
+                       next = slots.begin()->slot;
+                       const TimeStamp &stamp = next->get_timeout();
+                       const TimeStamp t = now();
+                       if(stamp<=t)
+                               break;
+                       else if(block)
+                       {
+                               blocking = true;
+                               mutex.unlock();
+                               sem.wait(stamp-t);
+                               mutex.lock();
+                       }
+                       else
+                               return;
+               }
+
+               pop_heap(slots.begin(), slots.end());
+               slots.pop_back();
        }
 
-       mutex.lock();
-       Slot *next=slots.top();
-       mutex.unlock();
-
-       const TimeStamp &stamp=next->get_timeout();
-       const TimeStamp t=now();
-       if(stamp<=t || (block && sem.wait(stamp-t)==1))
+       try
        {
-               slots.pop();
                if(next->signal_timeout.emit() && next->increment())
-                       slots.push(next);
+               {
+                       MutexLock l(mutex);
+                       slots.push_back(next);
+                       push_heap(slots.begin(), slots.end());
+               }
                else
                        delete next;
        }
+       catch(...)
+       {
+               delete next;
+               throw;
+       }
 }
 
-bool Timer::slot_compare(Slot *a, Slot *b)
+TimeStamp Timer::get_next_timeout() const
 {
-       return *a<*b;
+       if(slots.empty())
+               return TimeStamp();
+       return slots.begin()->slot->get_timeout();
 }
 
 
@@ -89,13 +132,18 @@ bool Timer::Slot::increment()
 {
        if(!interval)
                return false;
-       timeout+=interval;
+       timeout += interval;
        return true;
 }
 
-bool Timer::Slot::operator<(const Slot &other) const
+
+Timer::SlotProxy::SlotProxy(Slot *s):
+       slot(s)
+{ }
+
+bool Timer::SlotProxy::operator<(const SlotProxy &sp) const
 {
-       return timeout<other.timeout;
+       return slot->get_timeout()>sp.slot->get_timeout();
 }
 
 } // namespace Time