X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Ftimer.cpp;h=04c3074494e921d39f3edb54e53e378c8623e826;hp=7c9567ecfecccafe826f8d1fcd52d0bb82d6f899;hb=41363aed34382386f915f17c1a961750b4fdcb14;hpb=ac26a7e3db27d27ea322ccc17bb093b348b30ae8

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index 7c9567e..04c3074 100644
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -1,4 +1,4 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include <msp/core/raii.h>
 #include "timer.h"
 #include "utils.h"
@@ -9,14 +9,13 @@ namespace Msp {
 namespace Time {
 
 Timer::Timer():
-	sem(1),
-	blocking(false)
+	sem(1)
 { }
 
 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)
@@ -44,19 +43,35 @@ 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)
 {
-	Slot *next = 0;
+	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 = nullptr;
 	{
 		MutexLock l(mutex);
 		while(1)
@@ -71,12 +86,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();