X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTimer.cc;h=3e42818962d5df7e124f7edc96ed4384ca3dc171;hp=d28d5e89fd9d8ef39b379459a0b3a51b6009de3f;hb=c85b710e7ead9bc417805bb893571a7139f1081c;hpb=33842c860fe18ca8cf087905992885687434320c diff --git a/src/Moof/Timer.cc b/src/Moof/Timer.cc index d28d5e8..3e42818 100644 --- a/src/Moof/Timer.cc +++ b/src/Moof/Timer.cc @@ -1,35 +1,19 @@ -/******************************************************************************* - - 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. +* +**************************************************************************/ #include #include #include -#include + +#include #include "Log.hh" #include "Timer.hh" @@ -38,14 +22,12 @@ #include "config.h" #endif -#include - namespace Mf { -Scalar Timer::nextFire_ = std::numeric_limits::max(); -std::map Timer::timers_; +Scalar Timer::gNextFire = std::numeric_limits::max(); +std::map Timer::gTimers; unsigned Timer::getNewID() @@ -59,43 +41,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) + if (mode == ACTUAL) { - absolute_ = seconds; + mAbsolute = seconds; } else { - absolute_ = seconds - getTicks(); - interval_ = seconds; + mAbsolute = seconds - getTicks(); + mInterval = seconds; } - id_ = getNewID(); - timers_.insert(std::pair(id_, *this)); + mId = getNewID(); + gTimers.insert(std::pair(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 +86,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 { @@ -124,12 +106,12 @@ void Timer::fire() Scalar Timer::findNextFire() { - std::map::iterator it; + std::map::iterator it; Scalar nextFire = std::numeric_limits::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 +121,7 @@ Scalar Timer::findNextFire() Scalar Timer::getSecondsRemaining() const { - return absolute_ - getTicks(); + return mAbsolute - getTicks(); } bool Timer::isExpired() const @@ -149,32 +131,37 @@ bool Timer::isExpired() const bool Timer::isRepeating() const { - return mode_ == REPEAT; + return mMode == REPEAT; } +void Timer::fireIfExpired() +{ + fireIfExpired(getTicks()); +} + void Timer::fireIfExpired(Scalar t) { - std::map::iterator it; + std::map::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 -// 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. +// 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 setReference_() { @@ -195,20 +182,19 @@ 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; + return Scalar(ts.tv_sec - reference) + + Scalar(ts.tv_nsec) / 1000000000.0; } -void Timer::sleep(Scalar seconds, bool absolute) +void Timer::sleep(Scalar seconds, Mode mode) { struct timespec ts; int ret; - if (absolute) seconds -= getTicks(); + if (mode == ACTUAL) seconds -= getTicks(); ts.tv_sec = time_t(seconds); ts.tv_nsec = long((seconds - Scalar(ts.tv_sec)) * 1000000000.0); @@ -223,9 +209,9 @@ void Timer::sleep(Scalar seconds, bool absolute) #else // ! HAVE_CLOCK_GETTIME -// 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 -// butt. +// 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. Scalar Timer::getTicks() { @@ -233,9 +219,9 @@ Scalar Timer::getTicks() return Scalar(ms / 1000) + Scalar(ms % 1000) / 1000.0; } -void Timer::sleep(Scalar seconds, bool absolute) +void Timer::sleep(Scalar seconds, Mode mode) { - if (absolute) seconds -= getTicks(); + if (mode == ACTUAL) seconds -= getTicks(); SDL_Delay(Uint32(cml::clamp(int(seconds * 1000.0), 0, 1000))); } @@ -244,5 +230,3 @@ void Timer::sleep(Scalar seconds, bool absolute) } // namespace Mf -/** vim: set ts=4 sw=4 tw=80: *************************************************/ -