X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Ftimer.h;h=62f248d23a722078472c461b9f04186c6cdd827d;hp=cfa00bb0d1511f42f09591b04dbc5527ee8deb91;hb=be8ea216d23bf36bdfb2d3e302638782575fc136;hpb=3d1b0b44b2d75ed7d97b3588eefe61a9b511365c

diff --git a/source/time/timer.h b/source/time/timer.h
index cfa00bb..62f248d 100644
--- a/source/time/timer.h
+++ b/source/time/timer.h
@@ -1,16 +1,12 @@
-/*
-This file is part of libmspcore     
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_TIME_TIMER_H_
 #define MSP_TIME_TIMER_H_
 
-#include <queue>
+#include <vector>
 #include <sigc++/sigc++.h>
-#include "../core/mutex.h"
-#include "../core/semaphore.h"
+#include <msp/core/attributes.h>
+#include <msp/core/mutex.h>
+#include <msp/core/noncopyable.h>
+#include <msp/core/semaphore.h>
 #include "timedelta.h"
 #include "timestamp.h"
 
@@ -24,7 +20,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
@@ -41,42 +37,53 @@ public:
 		Slot(const TimeStamp &);
 		const TimeStamp &get_timeout() const { return timeout; }
 		bool increment();
-		bool operator<(const Slot &) const;
 	};
 
 private:
-	typedef bool (*fSlotCompare)(Slot *, Slot *);
+	struct SlotProxy
+	{
+		Slot *slot;
+
+		SlotProxy(Slot *);
+		bool operator<(const SlotProxy &) const;
+	};
 
-	std::priority_queue<Slot *, std::vector<Slot *>, fSlotCompare> slots;
+	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
-	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 &);
 
-	/**
-	Checks all timers, executing any that have timed out.  If block is true,
-	waits until one times out.
+	/** Cancels a previously added timer. */
+	void cancel(Slot &);
+
+	/** Deprecated.  Use one of the other overloads. */
+	DEPRECATED void tick(bool block);
+
+	/** 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 &);
 
-	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);
 private:
-	static bool slot_compare(Slot *, Slot *);
+	void do_tick(const TimeDelta &);
+
+public:
+	TimeStamp get_next_timeout() const;
 };
 
 } // namespace Time