X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Ftimer.cpp;h=9411facc5d08bf667d73373e03eba43d0acd350c;hp=59360b63fa6e18a83fed699429bf7e76a75d0b75;hb=f24e7b96e76b63c9b9b8a6bce4c7a9db64276ea8;hpb=d16185720fa344263367dbd50c61bfc8183d99a4

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index 59360b6..9411fac 100644
--- 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"
 
@@ -7,70 +8,99 @@ 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)
-		delete i->slot;
+	for(const SlotProxy &s: slots)
+		delete s.slot;
 }
 
 Timer::Slot &Timer::add(const TimeDelta &td)
 {
 	Slot *s = new Slot(td);
-	mutex.lock();
+	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();
+	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;
-		}
+	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(bool block)
+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;
 		}