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

diff --git a/source/time/timer.cpp b/source/time/timer.cpp
index 7c9567e..be1d1ed 100644
--- a/source/time/timer.cpp
+++ b/source/time/timer.cpp
@@ -56,6 +56,28 @@ 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);
@@ -71,12 +93,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();