From c3bb89f8f49202d2551d6de1b01de9df8c8371d6 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Sun, 27 Jul 2008 20:36:14 +0000
Subject: New timer implementation using TimerQueue on Windows to avoid the
 need to create and manage a separate thread ourselves.

---
 lib/common/Timer.h | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'lib/common/Timer.h')

diff --git a/lib/common/Timer.h b/lib/common/Timer.h
index ba6d71f4..42b2e00f 100644
--- a/lib/common/Timer.h
+++ b/lib/common/Timer.h
@@ -40,35 +40,24 @@ class Timers
 
 	static bool sRescheduleNeeded;
 	static void SignalHandler(int iUnused);
-	
+
 	public:
 	static void Init();
 	static void Cleanup();
 	static void Add   (Timer& rTimer);
 	static void Remove(Timer& rTimer);
-	static void RequestReschedule()
-	{
-		sRescheduleNeeded = true;
-	}
-
-	static void RescheduleIfNeeded()
-	{
-		if (sRescheduleNeeded) 
-		{
-			Reschedule();
-		}
-	}
+	static void RequestReschedule();
+	static void RescheduleIfNeeded();
 };
 
 class Timer
 {
 public:
-	Timer(size_t timeoutSecs);
+	Timer(size_t timeoutSecs, const std::string& rName = "");
 	virtual ~Timer();
 	Timer(const Timer &);
 	Timer &operator=(const Timer &);
 
-public:
 	box_time_t   GetExpiryTime() { return mExpires; }
 	virtual void OnExpire();
 	bool         HasExpired()
@@ -76,10 +65,23 @@ public:
 		Timers::RescheduleIfNeeded();
 		return mExpired; 
 	}
+
+	const std::string& GetName() const { return mName; }
 	
 private:
-	box_time_t mExpires;
-	bool       mExpired;
+	box_time_t  mExpires;
+	bool        mExpired;
+	std::string mName;
+
+	void Start();
+	void Start(int64_t delayInMicros);
+	void Stop();
+
+	#ifdef WIN32
+	HANDLE mTimerHandle;
+	static VOID CALLBACK TimerRoutine(PVOID lpParam,
+		BOOLEAN TimerOrWaitFired);
+	#endif
 };
 
 #include "MemLeakFindOff.h"
-- 
cgit v1.2.3