From 108f2e7de1c2427e39cdf55efbcd0ca3914e451a Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 25 Dec 2015 12:16:47 +0200
Subject: [PATCH] Split Timer::tick into two overloads

This is in line with other similar interfaces, such as Poller and
Semaphore.  The old function still exists but is deprecated.
---
 source/time/timer.cpp | 28 ++++++++++++++++++++++++++--
 source/time/timer.h   | 18 +++++++++++++-----
 2 files changed, 39 insertions(+), 7 deletions(-)

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();
diff --git a/source/time/timer.h b/source/time/timer.h
index 90d870c..21aeb2b 100644
--- a/source/time/timer.h
+++ b/source/time/timer.h
@@ -66,13 +66,21 @@ public:
 	/** Cancels a previously added timer. */
 	void cancel(Slot &);
 
-	/** Checks all timers, executing any that have timed out.  If block is true,
-	waits until one times out.
+	/** Deprecated.  Use one of the other overloads. */
+	void tick(bool block);
 
-	Note: If there are no active timers when a blocking tick is executed, it
-	won't return until a timer is added from another thread. */
-	void tick(bool block = true);
+	/** Waits until a timer expires, then executes it.  If no timers have been
+	set, blocks until one is added from another thread. */
+	void tick();
 
+	/** Waits until a timer expires but at most the specified amount of time.
+	If a timer did expire before the timeout, it is executed. */
+	void tick(const TimeDelta &);
+
+private:
+	void do_tick(const TimeDelta &);
+
+public:
 	TimeStamp get_next_timeout() const;
 };
 
-- 
2.43.0