Add move semantics to Variant

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

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index 9fc82f57e872bf0b0c1f1dcc3ee8f974003eafd5..eda782e0d92c5bf82c00418584e12917d03fa673 100644 (file)
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -1,9 +1,5 @@
-/*
-This file is part of libmspcore     
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/core/algorithm.h>
+#include <msp/core/raii.h>
 #include "timer.h"
 #include "utils.h"
 
@@ -13,66 +9,128 @@ namespace Msp {
 namespace Time {
 
 Timer::Timer():
-       slots(slot_compare)
+       sem(1)
 { }
 
 Timer::~Timer()
 {
-       while(!slots.empty())
-       {
-               delete slots.top();
-               slots.pop();
-       }
+       for(const SlotProxy &s: slots)
+               delete s.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::tick(bool block)
+void Timer::cancel(Slot &slot)
 {
-       if(slots.empty())
+       MutexLock l(mutex);
+       auto i = find_member(slots, &slot, &SlotProxy::slot);
+       if(i!=slots.end())
        {
-               if(block)
-                       sem.wait();
-               return;
+               delete i->slot;
+               slots.erase(i);
+               make_heap(slots.begin(), slots.end());
        }
+}
+
+void Timer::tick()
+{
+       do_tick(-sec);
+}
+
+void Timer::tick(const TimeDelta &timeout)
+{
+       if(timeout<zero)
+               throw invalid_argument("Timer::tick");
 
-       mutex.lock();
-       Slot *next=slots.top();
-       mutex.unlock();
+       do_tick(timeout);
+}
+
+void Timer::do_tick(const TimeDelta &timeout)
+{
+       TimeStamp deadline;
+       if(timeout>=zero)
+               deadline = now()+timeout;
+
+       Slot *next = nullptr;
+       {
+               MutexLock l(mutex);
+               while(1)
+               {
+                       TimeStamp stamp;
+                       TimeStamp t = now();
+                       if(!slots.empty())
+                       {
+                               next = slots.begin()->slot;
+                               stamp = next->get_timeout();
+                               if(stamp<=t)
+                                       break;
+                       }
+
+                       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;
+               }
+
+               pop_heap(slots.begin(), slots.end());
+               slots.pop_back();
+       }
 
-       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 +147,14 @@ bool Timer::Slot::increment()
 {
        if(!interval)
                return false;
-       timeout+=interval;
+       timeout += interval;
        return true;
 }
 
-bool Timer::Slot::operator<(const Slot &other) const
+
+bool Timer::SlotProxy::operator<(const SlotProxy &sp) const
 {
-       return timeout<other.timeout;
+       return slot->get_timeout()>sp.slot->get_timeout();
 }
 
 } // namespace Time