X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTimer.hh;h=4cc848048c5655d38aabe2e89b47d9a9bc9669e4;hp=bb0b48334c6b24cab36f8a8e4328f5e8b80186ea;hb=2f239b9ba2a556a5ca810cfffc60552a56a4fe86;hpb=8a1acac01b444dccf8b57cedf08392ada2e473c1

diff --git a/src/Moof/Timer.hh b/src/Moof/Timer.hh
index bb0b483..4cc8480 100644
--- a/src/Moof/Timer.hh
+++ b/src/Moof/Timer.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_TIMER_HH_
 #define _MOOF_TIMER_HH_
@@ -53,7 +36,7 @@ public:
 	{
 		INVALID		= -1,
 		NORMAL		=  0,
-		ABSOLUTEE	=  1,	// the ABSOLUTE keyword isn't available on win32...
+		ACTUAL		=  1,
 		REPEAT		=  2
 	};
 
@@ -73,7 +56,8 @@ public:
 		invalidate();
 	}
 
-	void init(const Function& function, Scalar seconds, Mode mode = NORMAL);
+	void init(const Function& function, Scalar seconds,
+			  Mode mode = NORMAL);
 
 	bool isValid() const;
 	void invalidate();
@@ -86,7 +70,8 @@ public:
 
 
 	/**
-	 * Get the number of seconds since a fixed, arbitrary point in the past.
+	 * Get the number of seconds since a fixed, arbitrary point in the
+	 * past.
 	 * @return Seconds.
 	 */
 
@@ -94,15 +79,16 @@ public:
 
 
 	/**
-	 * Put the thread to sleep for a certain period of time.  If absolute is true,
-	 * then it will sleep until seconds after the fixed time in the past.  If
-	 * absolute is false, it will sleep for seconds starting now.  Unlike system
-	 * sleep functions, this one automatically resumes sleep if sleep was
-	 * interrupted by a signal.  Therefore, calling this function is guaranteed to
-	 * sleep for the requested amount of time (and maybe longer).
+	 * Put the thread to sleep for a certain period of time.  If absolute
+	 * is true, then it will sleep until seconds after the fixed time in
+	 * the past.  If absolute is false, it will sleep for seconds starting
+	 * now.  Unlike system sleep functions, this one automatically resumes
+	 * sleep if sleep was interrupted by a signal.  Therefore, calling this
+	 * function is guaranteed to sleep for the requested amount of time
+	 * (and maybe longer).
 	 */
 
-	static void sleep(Scalar seconds, bool absolute = false);
+	static void sleep(Scalar seconds, Mode mode = NORMAL);
 
 
 	static Scalar getNextFire()
@@ -110,6 +96,7 @@ public:
 		return gNextFire;
 	}
 
+	static void fireIfExpired();
 	static void fireIfExpired(Scalar t);
 
 private:
@@ -124,14 +111,11 @@ private:
 	unsigned	mId;
 
 	static Scalar						gNextFire;
-	static std::map<unsigned,Timer&>	gTimers;
+	static std::map<unsigned,Timer*>	gTimers;
 };
 
 
 } // namespace Mf
 
-
 #endif // _MOOF_TIMER_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-