sleep forever bug fixed

[chaz/yoink] / src / Moof / Timer.cc

diff --git a/src/Moof/Timer.cc b/src/Moof/Timer.cc
index d28d5e89fd9d8ef39b379459a0b3a51b6009de3f..a4dcf4047dfcc591f327accff93fa46039f7febc 100644 (file)
--- 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()
@@ -59,43 +58,43 @@ void Timer::init(const Function& function, Scalar seconds, Mode mode)
 {
        invalidate();
 
-       mode_ = mode;
+       mMode = mode;
 
-       if (mode_ != INVALID)
+       if (mMode != INVALID)
        {
-               function_ = function;
+               mFunction = function;
 
                if (mode == ABSOLUTEE)
                {
-                       absolute_ = seconds;
+                       mAbsolute = seconds;
                }
                else
                {
-                       absolute_ = seconds - getTicks();
-                       interval_ = seconds;
+                       mAbsolute = seconds - getTicks();
+                       mInterval = seconds;
                }
 
-               id_ = getNewID();
-               timers_.insert(std::pair<unsigned,Timer&>(id_, *this));
+               mId = getNewID();
+               gTimers.insert(std::pair<unsigned,Timer&>(mId, *this));
 
-               if (absolute_ < nextFire_) nextFire_ = absolute_;
+               if (mAbsolute < gNextFire) gNextFire = mAbsolute;
        }
 }
 
 
 bool Timer::isValid() const
 {
-       return mode_ != INVALID;
+       return mMode != INVALID;
 }
 
 void Timer::invalidate()
 {
-       if (mode_ != INVALID)
+       if (mMode != INVALID)
        {
-               timers_.erase(id_);
-               mode_ = INVALID;
+               gTimers.erase(mId);
+               mMode = INVALID;
 
-               if (isEqual(absolute_, nextFire_)) nextFire_ = findNextFire();
+               if (isEqual(mAbsolute, gNextFire)) gNextFire = findNextFire();
        }
 }
 
@@ -104,16 +103,16 @@ void Timer::fire()
 {
        Scalar t = getTicks();
 
-       if (function_) function_(*this, t);
+       if (mFunction) mFunction(*this, t);
 
        if (isRepeating())
        {
-               Scalar absolute = absolute_;
+               Scalar absolute = mAbsolute;
 
-               if (isEqual(absolute_, t, 1.0)) absolute_ += interval_;
-               else absolute_ = interval_ + t;
+               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
        {
@@ -127,9 +126,9 @@ Scalar Timer::findNextFire()
        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.absolute_;
+               Scalar absolute = (*it).second.mAbsolute;
                if (absolute < nextFire) nextFire = absolute;
        }
 
@@ -139,7 +138,7 @@ Scalar Timer::findNextFire()
 
 Scalar Timer::getSecondsRemaining() const
 {
-       return absolute_ - getTicks();
+       return mAbsolute - getTicks();
 }
 
 bool Timer::isExpired() const
@@ -149,7 +148,7 @@ bool Timer::isExpired() const
 
 bool Timer::isRepeating() const
 {
-       return mode_ == REPEAT;
+       return mMode == REPEAT;
 }
 
 
@@ -157,9 +156,9 @@ void Timer::fireIfExpired(Scalar t)
 {
        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();
@@ -169,7 +168,7 @@ void Timer::fireIfExpired(Scalar t)
 
 #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;
 }