]> Dogcows Code - chaz/yoink/blobdiff - src/moof/timer.cc
remove some unused stlplus modules
[chaz/yoink] / src / moof / timer.cc
index f16a962dfa688b032ad92da9506a92c6b24ab416..82f8cfa3ec4dbf13a5a1962936b35f9d4295c226 100644 (file)
@@ -1,15 +1,15 @@
 
-/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+/*]  Copyright (c) 2009-2011, 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.
 *
-**************************************************************************/
+*****************************************************************************/
 
+#if HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <cerrno>
 #include <ctime>
 #include <SDL/SDL.h>
 
 #include "debug.hh"
+#include "runloop.hh"
 #include "timer.hh"
 
 
 namespace moof {
 
 
-scalar timer::next_event_ = std::numeric_limits<scalar>::max();
-hash<unsigned,timer*,hash_function> timer::timers_;
-
-
-unsigned timer::new_identifier()
+void timer::init(const function& function,
+               scalar seconds, enum mode mode, timer_source& source)
 {
-       static unsigned id = 1;
-       return id++;
-}
-
+       source_ = &source;
 
-void timer::init(const function& function, scalar seconds, mode mode)
-{
        invalidate();
-
-       mode_ = mode;
-
-       if (mode_ != invalid)
+       if ((mode_ = mode) != invalid)
        {
                function_ = function;
 
@@ -51,55 +41,49 @@ void timer::init(const function& function, scalar seconds, mode mode)
                }
                else
                {
-                       absolute_ = seconds ticks();
+                       absolute_ = seconds + source_->ticks();
                        interval_ = seconds;
                }
-
-               id_ = new_identifier();
-               timers_.insert(std::pair<unsigned,timer*>(id_, this));
-
-               if (absolute_ < next_event_) next_event_ = absolute_;
        }
 }
 
-
-bool timer::is_valid() const
+timer::~timer()
 {
-       return mode_ != invalid;
+       detach_from_runloop();
 }
 
 void timer::invalidate()
 {
-       if (mode_ != invalid)
-       {
-               timers_.erase(id_);
-               mode_ = invalid;
-
-               if (is_equal(absolute_, next_event_))
-               {
-                       next_event_ = find_next_event();
-               }
-       }
+       mode_ = invalid;
+       absolute_ = SCALAR(0.0);
 }
 
+void timer::added_to_runloop(runloop& runloop)
+{
+       detach_from_runloop();
+       runloop_ = &runloop;
+}
 
-void timer::fire()
+void timer::detach_from_runloop()
 {
-       scalar t = ticks();
+       if (runloop_)
+       {
+               runloop_->remove_timer(*this);
+               runloop_ = 0;
+       }
+}
 
+void timer::fire(scalar t)
+{
        if (function_) function_(*this, t);
 
-       if (is_repeating())
+       if (mode_ == repeat)
        {
-               scalar absolute = absolute_;
-
-               if (is_equal(absolute_, t, 1.0)) absolute_ += interval_;
-               else absolute_ = interval_ + t;
-
-               if (is_equal(absolute, next_event_))
-               {
-                       next_event_ = find_next_event();
-               }
+               if (is_equal(absolute_, t, 1.0))
+                       absolute_ += interval_;
+               else
+                       absolute_ = interval_ + t;
+               // TODO error accumulates in absolute var
        }
        else
        {
@@ -107,94 +91,55 @@ void timer::fire()
        }
 }
 
-
-scalar timer::find_next_event()
-{
-       scalar next_fire = std::numeric_limits<scalar>::max();
-
-       hash<unsigned,timer*,hash_function>::iterator it;
-       for (it = timers_.begin(); it.valid(); ++it)
-       {
-               scalar absolute = (*it).second->absolute_;
-               if (absolute < next_fire) next_fire = absolute;
-       }
-
-       return next_fire;
-}
-
-
-scalar timer::seconds_remaining() const
-{
-       return absolute_ - ticks();
-}
-
-scalar timer::next_expiration() const
-{
-       return absolute_;
-}
-
-bool timer::is_expired() const
-{
-       return seconds_remaining() < 0.0;
-}
-
-bool timer::is_repeating() const
+scalar timer::ticks()
 {
-       return mode_ == repeat;
+       return default_source().ticks();
 }
 
-
-void timer::fire_expired_timers(scalar t)
+#if ENABLE_CLOCK_GETTIME
+class real_time : public timer_source
 {
-       if (t < next_event_) return;
+public:
 
-       hash<unsigned,timer*,hash_function>::iterator it;
-       for (it = timers_.begin(); it.valid(); ++it)
+       real_time() :
+               scale_(SCALAR(1.0))
        {
-               timer* timer = (*it).second;
-               if (timer->is_expired()) timer->fire();
-
-               if (it.end()) break;
+               reset();
        }
-}
-
-
-#if USE_CLOCK_GETTIME
-
-// 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 program starts).  Of course this isn't much
-// of an issue if scalar is a double-precision number.
 
-static time_t set_reference()
-{
-       struct timespec ts;
-
-       if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
+       scalar ticks() const
        {
-               return 0;
+               struct timespec ts;
+               int result = clock_gettime(CLOCK_MONOTONIC, &ts);
+               ASSERT(result == 0 && "monotonic clock not available");
+
+               return reference_ +
+                       (scalar(ts.tv_sec - start_.tv_sec) +
+                        scalar(ts.tv_nsec - start_.tv_nsec) *
+                        SCALAR(0.000000001)) * scale_;
        }
 
-       return ts.tv_sec;
-}
-
-static const time_t reference_ = set_reference();
-
+       void reset()
+       {
+               reference_ = SCALAR(0.0);
+               clock_gettime(CLOCK_MONOTONIC, &start_);
+       }
 
-scalar timer::ticks()
-{
-       struct timespec ts;
+       void scale(scalar factor)
+       {
+               reference_ = ticks();
+               clock_gettime(CLOCK_MONOTONIC, &start_);
+               scale_ = factor;
+       }
 
-       int result = clock_gettime(CLOCK_MONOTONIC, &ts);
-       ASSERT(result == 0 && "cannot access clock");
+private:
 
-       return scalar(ts.tv_sec - reference_) +
-                  scalar(ts.tv_nsec) * SCALAR(0.000000001);
-}
+       scalar          reference_;
+       struct timespec start_;
+       scalar          scale_;
+};
 
-void timer::sleep(scalar seconds, mode mode)
+void timer::sleep(scalar seconds, enum mode mode)
 {
        if (mode == absolute) seconds -= ticks();
        if (seconds < SCALAR(0.0)) return;
@@ -204,30 +149,59 @@ void timer::sleep(scalar seconds, mode mode)
        ts.tv_nsec = (seconds - scalar(ts.tv_sec)) * SCALAR(1000000000.0);
 
        int ret;
-       do ret = nanosleep(&ts, &ts); while (ret == -1 && errno == EINTR);
+       do ret = nanosleep(&ts, &ts);
+       while (ret == -1 && errno == EINTR);
 }
 
+#else // ! ENABLE_CLOCK_GETTIME
+class real_time : public timer_source
+{
+public:
+
+       real_time() :
+               scale_(SCALAR(0.001))
+       {
+               reset();
+       }
+
+       scalar ticks() const
+       {
+               return reference_ + scalar(SDL_GetTicks() - start_) * scale_;
+       }
 
-#else // ! USE_CLOCK_GETTIME
+       void reset()
+       {
+               reference_ = SCALAR(0.0);
+               start_ = SDL_GetTicks();
+       }
 
+       void scale(scalar factor)
+       {
+               reference_ = ticks();
+               start_ = SDL_GetTicks();
+               scale_ = factor * SCALAR(0.001);
+       }
 
-// If we don't have posix timers, we'll have to use a different timing
-// method.  SDL only promises centisecond accuracy, but that's better than
-// a kick in the pants.  It could end up being just as good anyway.
+private:
 
-scalar timer::ticks()
-{
-       return scalar(SDL_GetTicks()) * SCALAR(0.001);
-}
+       scalar  reference_;
+       Uint32  start_;
+       scalar  scale_;
+};
 
-void timer::sleep(scalar seconds, mode mode)
+void timer::sleep(scalar seconds, enum mode mode)
 {
        if (mode == absolute) seconds -= ticks();
        if (seconds < SCALAR(0.0)) return;
        SDL_Delay(seconds * SCALAR(1000.0));
 }
+#endif // ENABLE_CLOCK_GETTIME
 
-#endif // USE_CLOCK_GETTIME
+timer_source& timer::default_source()
+{
+       static real_time t;
+       return t;
+}
 
 
 } // namespace moof
This page took 0.026647 seconds and 4 git commands to generate.