X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Ftimer.h;h=21aeb2b4b5b02ea0b41932f4a3311028f35c7e55;hb=d716073b5f2e2fcc518d53ec6ef09c5971b6d0e4;hp=7566c3dd03a6a86eef6619c2d4ddd24ddbb373ca;hpb=d16185720fa344263367dbd50c61bfc8183d99a4;p=libs%2Fcore.git

diff --git a/source/time/timer.h b/source/time/timer.h
index 7566c3d..21aeb2b 100644
--- a/source/time/timer.h
+++ b/source/time/timer.h
@@ -49,8 +49,10 @@ private:
 	std::vector<SlotProxy> slots;
 	Semaphore sem;
 	Mutex mutex;
+	bool blocking;
 
 public:
+	Timer();
 	~Timer();
 
 	/** Adds a timer that will be executed periodically as long as the timeout
@@ -64,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;
 };