X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimer.cpp;h=be1d1ed3291482b453ab03d228f5961eb80b8cab;hb=108f2e7de1c2427e39cdf55efbcd0ca3914e451a;hp=f26900b8d4a589769c707b59513de6aa2d8dc129;hpb=aad3371b3d1831dd0525a51e40f637f00be6ff87;p=libs%2Fcore.git

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index f26900b..be1d1ed 100644
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <msp/core/raii.h>
 #include "timer.h"
 #include "utils.h"
 
@@ -55,35 +56,56 @@ void Timer::cancel(Slot &slot)
 
 void Timer::tick(bool block)
 {
+	if(block)
+		tick();
+	else
+		tick(zero);
+}
+
+void Timer::tick()
+{
+	do_tick(-sec);
+}
+
+void Timer::tick(const TimeDelta &timeout)
+{
+	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;