X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTimer.cc;h=7f51510ce60189320383f25272e87da9914dc353;hp=d17882a9b3e5b13645e75d91650febedb074293f;hb=c9e20ac06383b20ceb5404c9237e319c2e90d157;hpb=a31d65a998121df0651c57bfb68782e2a07d2e2f

diff --git a/src/Moof/Timer.cc b/src/Moof/Timer.cc
index d17882a..7f51510 100644
--- a/src/Moof/Timer.cc
+++ b/src/Moof/Timer.cc
@@ -29,7 +29,8 @@
 #include <cerrno>
 #include <ctime>
 #include <limits>
-#include <stdexcept>
+
+#include <SDL/SDL.h>
 
 #include "Log.hh"
 #include "Timer.hh"
@@ -38,14 +39,12 @@
 #include "config.h"
 #endif
 
-#include <SDL/SDL.h>
-
 
 namespace Mf {
 
 
-Scalar Timer::nextFire_ = std::numeric_limits<Scalar>::max();
-std::map<unsigned,Timer&> Timer::timers_;
+Scalar Timer::gNextFire = std::numeric_limits<Scalar>::max();
+std::map<unsigned,Timer*> Timer::gTimers;
 
 
 unsigned Timer::getNewID()
@@ -76,9 +75,9 @@ void Timer::init(const Function& function, Scalar seconds, Mode mode)
 		}
 
 		mId = getNewID();
-		timers_.insert(std::pair<unsigned,Timer&>(mId, *this));
+		gTimers.insert(std::pair<unsigned,Timer*>(mId, this));
 
-		if (mAbsolute < nextFire_) nextFire_ = mAbsolute;
+		if (mAbsolute < gNextFire) gNextFire = mAbsolute;
 	}
 }
 
@@ -92,10 +91,10 @@ void Timer::invalidate()
 {
 	if (mMode != INVALID)
 	{
-		timers_.erase(mId);
+		gTimers.erase(mId);
 		mMode = INVALID;
 
-		if (isEqual(mAbsolute, nextFire_)) nextFire_ = findNextFire();
+		if (isEqual(mAbsolute, gNextFire)) gNextFire = findNextFire();
 	}
 }
 
@@ -113,7 +112,7 @@ void Timer::fire()
 		if (isEqual(mAbsolute, t, 1.0)) mAbsolute += mInterval;
 		else mAbsolute = mInterval + t;
 
-		if (isEqual(absolute, nextFire_)) nextFire_ = findNextFire();
+		if (isEqual(absolute, gNextFire)) gNextFire = findNextFire();
 	}
 	else
 	{
@@ -124,12 +123,12 @@ void Timer::fire()
 
 Scalar Timer::findNextFire()
 {
-	std::map<unsigned,Timer&>::iterator it;
+	std::map<unsigned,Timer*>::iterator it;
 	Scalar nextFire = std::numeric_limits<Scalar>::max();
 
-	for (it = timers_.begin(); it != timers_.end(); ++it)
+	for (it = gTimers.begin(); it != gTimers.end(); ++it)
 	{
-		Scalar absolute = (*it).second.mAbsolute;
+		Scalar absolute = (*it).second->mAbsolute;
 		if (absolute < nextFire) nextFire = absolute;
 	}
 
@@ -155,21 +154,21 @@ bool Timer::isRepeating() const
 
 void Timer::fireIfExpired(Scalar t)
 {
-	std::map<unsigned,Timer&>::iterator it;
+	std::map<unsigned,Timer*>::iterator it;
 
-	if (nextFire_ > t) return;
+	if (gNextFire > t) return;
 
-	for (it = timers_.begin(); it != timers_.end(); ++it)
+	for (it = gTimers.begin(); it != gTimers.end(); ++it)
 	{
-		Timer& timer = (*it).second;
-		if (timer.isExpired()) timer.fire();
+		Timer* timer = (*it).second;
+		if (timer->isExpired()) timer->fire();
 	}
 }
 
 
 #if HAVE_CLOCK_GETTIME
 
-// Since the monotonic clock will provide us with the timer since the computer
+// Since the monotonic clock will provide us with the time since the computer
 // started, the number of seconds since that time could easily become so large
 // that it cannot be accurately stored in a float (even with as little two days
 // uptime), therefore we need to start from a more recent reference (when the
@@ -195,10 +194,8 @@ Scalar Timer::getTicks()
 {
 	struct timespec ts;
 
-	if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
-	{
-		throw std::runtime_error("cannot access monotonic clock");
-	}
+	int result = clock_gettime(CLOCK_MONOTONIC, &ts);
+	ASSERT(result == 0 && "cannot access clock");
 
 	return Scalar(ts.tv_sec - reference) + Scalar(ts.tv_nsec) / 1000000000.0;
 }