X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FTimer.cc;h=3e42818962d5df7e124f7edc96ed4384ca3dc171;hp=69d2405622f7031cf134715b053304b39afb5ea2;hb=837bae9f2bf7b25e1d3d2625eeaf39c1d2f48827;hpb=81ff940d1bea07447f8218ab9a764fbf393431e8 diff --git a/src/Moof/Timer.cc b/src/Moof/Timer.cc index 69d2405..3e42818 100644 --- a/src/Moof/Timer.cc +++ b/src/Moof/Timer.cc @@ -1,30 +1,13 @@ -/******************************************************************************* - - 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 @@ -173,12 +156,12 @@ void Timer::fireIfExpired(Scalar t) #if HAVE_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. +// 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_() { @@ -202,7 +185,8 @@ Scalar Timer::getTicks() 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, Mode mode) @@ -225,9 +209,9 @@ void Timer::sleep(Scalar seconds, Mode mode) #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() { @@ -246,5 +230,3 @@ void Timer::sleep(Scalar seconds, Mode mode) } // namespace Mf -/** vim: set ts=4 sw=4 tw=80: *************************************************/ -