sleep forever bug fixed

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

diff --git a/src/Moof/Timer.cc b/src/Moof/Timer.cc
index 4eea488ad7f43d29af7280f63ea3371f2380f4b2..a4dcf4047dfcc591f327accff93fa46039f7febc 100644 (file)
--- a/src/Moof/Timer.cc
+++ b/src/Moof/Timer.cc
@@ -28,8 +28,11 @@
 
 #include <cerrno>
 #include <ctime>
-#include <stdexcept>
+#include <limits>
 
+#include <SDL/SDL.h>
+
+#include "Log.hh"
 #include "Timer.hh"
 
 #if HAVE_CONFIG_H
@@ -40,9 +43,132 @@
 namespace Mf {
 
 
+Scalar Timer::gNextFire = std::numeric_limits<Scalar>::max();
+std::map<unsigned,Timer&> Timer::gTimers;
+
+
+unsigned Timer::getNewID()
+{
+       static unsigned id = 1;
+       return id++;
+}
+
+
+void Timer::init(const Function& function, Scalar seconds, Mode mode)
+{
+       invalidate();
+
+       mMode = mode;
+
+       if (mMode != INVALID)
+       {
+               mFunction = function;
+
+               if (mode == ABSOLUTEE)
+               {
+                       mAbsolute = seconds;
+               }
+               else
+               {
+                       mAbsolute = seconds - getTicks();
+                       mInterval = seconds;
+               }
+
+               mId = getNewID();
+               gTimers.insert(std::pair<unsigned,Timer&>(mId, *this));
+
+               if (mAbsolute < gNextFire) gNextFire = mAbsolute;
+       }
+}
+
+
+bool Timer::isValid() const
+{
+       return mMode != INVALID;
+}
+
+void Timer::invalidate()
+{
+       if (mMode != INVALID)
+       {
+               gTimers.erase(mId);
+               mMode = INVALID;
+
+               if (isEqual(mAbsolute, gNextFire)) gNextFire = findNextFire();
+       }
+}
+
+
+void Timer::fire()
+{
+       Scalar t = getTicks();
+
+       if (mFunction) mFunction(*this, t);
+
+       if (isRepeating())
+       {
+               Scalar absolute = mAbsolute;
+
+               if (isEqual(mAbsolute, t, 1.0)) mAbsolute += mInterval;
+               else mAbsolute = mInterval + t;
+
+               if (isEqual(absolute, gNextFire)) gNextFire = findNextFire();
+       }
+       else
+       {
+               invalidate();
+       }
+}
+
+
+Scalar Timer::findNextFire()
+{
+       std::map<unsigned,Timer&>::iterator it;
+       Scalar nextFire = std::numeric_limits<Scalar>::max();
+
+       for (it = gTimers.begin(); it != gTimers.end(); ++it)
+       {
+               Scalar absolute = (*it).second.mAbsolute;
+               if (absolute < nextFire) nextFire = absolute;
+       }
+
+       return nextFire;
+}
+
+
+Scalar Timer::getSecondsRemaining() const
+{
+       return mAbsolute - getTicks();
+}
+
+bool Timer::isExpired() const
+{
+       return getSecondsRemaining() < 0.0;
+}
+
+bool Timer::isRepeating() const
+{
+       return mMode == REPEAT;
+}
+
+
+void Timer::fireIfExpired(Scalar t)
+{
+       std::map<unsigned,Timer&>::iterator it;
+
+       if (gNextFire > t) return;
+
+       for (it = gTimers.begin(); it != gTimers.end(); ++it)
+       {
+               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
@@ -64,18 +190,32 @@ static time_t setReference_()
 static const time_t reference = setReference_();
 
 
-Scalar getTicks()
+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;
 }
 
+void Timer::sleep(Scalar seconds, bool absolute)
+{
+       struct timespec ts;
+       int ret;
+
+       if (absolute) seconds -= getTicks();
+       ts.tv_sec = time_t(seconds);
+       ts.tv_nsec = long((seconds - Scalar(ts.tv_sec)) * 1000000000.0);
+
+       do
+       {
+               ret = nanosleep(&ts, &ts);
+       }
+       while (ret == -1 && errno == EINTR);
+}
+
 
 #else // ! HAVE_CLOCK_GETTIME
 
@@ -84,34 +224,20 @@ Scalar getTicks()
 // SDL only promises centisecond accuracy, but that's better than a kick in the
 // butt.
 
-#include <SDL/SDL.h>
-
-Scalar getTicks()
+Scalar Timer::getTicks()
 {
        Uint32 ms = SDL_GetTicks();
        return Scalar(ms / 1000) + Scalar(ms % 1000) / 1000.0;
 }
 
-
-#endif // HAVE_CLOCK_GETTIME
-
-
-void sleep(Scalar seconds, bool absolute)
+void Timer::sleep(Scalar seconds, bool absolute)
 {
-       struct timespec ts;
-       int ret;
-
        if (absolute) seconds -= getTicks();
-       ts.tv_sec = time_t(seconds);
-       ts.tv_nsec = long((seconds - Scalar(ts.tv_sec)) * 1000000000.0);
-
-       do
-       {
-               ret = nanosleep(&ts, &ts);
-       }
-       while (ret == -1 && errno == EINTR);
+       SDL_Delay(Uint32(cml::clamp(int(seconds * 1000.0), 0, 1000)));
 }
 
+#endif // HAVE_CLOCK_GETTIME
+
 
 } // namespace Mf