Calculates timeouts of ClockTool based upon System Clock

Users expect time switches to happen upon system clock times. Calculating the
timeout for the next refresh of the shown time via the monotonic clock is
wrong: The monotonic clock yields values based upon some arbitrary point in
time which might be off a little bit to the system clock, a 'full' minute of
the monotonic clock might be in the midst of a system clock minute.

1 files changed, 14 insertions, 10 deletions

diff --git a/src/FbTk/FbTime.cc b/src/FbTk/FbTime.cc
index d0ef731..c86edb1 100644
--- a/src/FbTk/FbTime.cc
+++ b/src/FbTk/FbTime.cc
@@ -21,6 +21,8 @@
 
 #include "FbTime.hh"
 
+#include <cstdlib>
+#include <sys/time.h>
 
 
 #ifdef HAVE_CLOCK_GETTIME // linux|*bsd|solaris
@@ -28,16 +30,16 @@
 
 namespace {
 
-uint64_t _now() {
+uint64_t _mono() {
 
-    uint64_t n = 0L;
+    uint64_t t = 0L;
     timespec ts;
 
     if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
-        n = (ts.tv_sec * FbTk::FbTime::IN_SECONDS) + (ts.tv_nsec / 1000L);
+        t = (ts.tv_sec * FbTk::FbTime::IN_SECONDS) + (ts.tv_nsec / 1000L);
     }
 
-    return n;
+    return t;
 }
 
 }
@@ -59,7 +61,7 @@ uint64_t _now() {
 
 namespace {
 
-uint64_t _now() {
+uint64_t _mono() {
 
     // mach_absolute_time() * info.numer / info.denom yields
     // nanoseconds.
@@ -85,13 +87,15 @@ uint64_t _now() {
 
 
 
-
-uint64_t FbTk::FbTime::now() {
-    return ::_now();
+uint64_t FbTk::FbTime::mono() {
+    return ::_mono();
 }
 
 
-uint64_t FbTk::FbTime::remainingNext(uint64_t unit) {
-    return (unit - (::_now() % unit) - 1);
+uint64_t FbTk::FbTime::system() {
+    static timeval v;
+    gettimeofday(&v, NULL);
+    return (v.tv_sec * FbTk::FbTime::IN_SECONDS) + v.tv_usec;
 }
 
+