X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Ftimer.h;h=33257319eba3466d89f28c650efcd26dde0a996d;hp=a0dabcdbd7b7cc8e08d553ba7c3e8ea46797762c;hb=41363aed34382386f915f17c1a961750b4fdcb14;hpb=5889d53f8f073ff0e1e1ebbd786abecd8352a7b3

diff --git a/source/time/timer.h b/source/time/timer.h
index a0dabcd..3325731 100644
--- a/source/time/timer.h
+++ b/source/time/timer.h
@@ -1,17 +1,11 @@
-/* $Id$
-
-This file is part of libmspcore     
-Copyright © 2006, 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_TIME_TIMER_H_
 #define MSP_TIME_TIMER_H_
 
 #include <vector>
 #include <sigc++/sigc++.h>
-#include "../core/mutex.h"
-#include "../core/semaphore.h"
+#include <msp/core/mutex.h>
+#include <msp/core/noncopyable.h>
+#include <msp/core/semaphore.h>
 #include "timedelta.h"
 #include "timestamp.h"
 
@@ -25,7 +19,7 @@ of the returned slot.
 
 This class is thread-safe, to allow running timers in a separate thread.
 */
-class Timer
+class Timer: private NonCopyable
 {
 public:
 	class Slot
@@ -47,7 +41,7 @@ public:
 private:
 	struct SlotProxy
 	{
-		Slot *slot;
+		Slot *slot = nullptr;
 
 		SlotProxy(Slot *);
 		bool operator<(const SlotProxy &) const;
@@ -56,36 +50,35 @@ private:
 	std::vector<SlotProxy> slots;
 	Semaphore sem;
 	Mutex mutex;
+	bool blocking = false;
 
 public:
+	Timer();
 	~Timer();
 
-	/**
-	Adds a timer that will be executed periodically as long as the timeout
-	signal hander returns true.
-	*/
+	/** Adds a timer that will be executed periodically as long as the timeout
+	signal hander returns true. */
 	Slot &add(const TimeDelta &);
 
-	/**
-	Adds a timer that will be executed once at a specific time.  The return
-	value of the timeout signal handler is ignored.
-	*/
+	/** Adds a timer that will be executed once at a specific time.  The return
+	value of the timeout signal handler is ignored. */
 	Slot &add(const TimeStamp &);
 
-	/**
-	Cancels a previously added timer.
-	*/
+	/** 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.
+	/** Waits until a timer expires, then executes it.  If no timers have been
+	set, blocks until one is added from another thread. */
+	void tick();
 
-	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 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;
 };