Use C++11 features with containers

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

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index f26900b8d4a589769c707b59513de6aa2d8dc129..9411facc5d08bf667d73373e03eba43d0acd350c 100644 (file)
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -1,4 +1,5 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
+#include <msp/core/raii.h>
 #include "timer.h"
 #include "utils.h"
 
@@ -14,8 +15,8 @@ Timer::Timer():
 
 Timer::~Timer()
 {
-       for(vector<SlotProxy>::iterator i=slots.begin(); i!=slots.end(); ++i)
-               delete i->slot;
+       for(const SlotProxy &s: slots)
+               delete s.slot;
 }
 
 Timer::Slot &Timer::add(const TimeDelta &td)
@@ -43,47 +44,62 @@ Timer::Slot &Timer::add(const TimeStamp &ts)
 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;
-               }
+       auto i = find_member(slots, &slot, &SlotProxy::slot);
+       if(i!=slots.end())
+       {
+               delete i->slot;
+               slots.erase(i);
+               make_heap(slots.begin(), slots.end());
+       }
+}
+
+void Timer::tick()
+{
+       do_tick(-sec);
 }
 
-void Timer::tick(bool block)
+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)
-                               {
-                                       blocking = true;
-                                       mutex.unlock();
-                                       sem.wait();
-                                       mutex.lock();
-                               }
-                               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)
+                       if(timeout && (!deadline || t<deadline))
                        {
-                               blocking = true;
+                               SetFlag setf(blocking);
                                mutex.unlock();
-                               sem.wait(stamp-t);
+                               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;