Detect local time changes.

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index fc36f4605ffbb7b514ac50f7ee074de652b097c9..0838ea9182e4010b205f8f2f3b6e3cc2308a5dc7 100644 (file)
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -99,6 +99,8 @@ void Application::RunEventLoop(void)
        double nextProfile = 0;
 #endif /* _DEBUG */
 
+       double lastLoop = Utility::GetTime();
+
        while (!m_ShuttingDown) {
                Object::ClearHeldObjects();
 
@@ -123,6 +125,20 @@ void Application::RunEventLoop(void)
                        nextProfile = Utility::GetTime() + 15.0;
                }
 #endif /* _DEBUG */
+
+               double now = Utility::GetTime();
+
+               if (now < lastLoop) {
+                       /* We moved backwards in time - cool. */
+                       double lostTime = lastLoop - now;
+                       stringstream msgbuf;
+                       msgbuf << "We moved backwards in time: " << lostTime
+                              << " seconds";
+                       Logger::Write(LogInformation, "base", msgbuf.str());
+                       Timer::AdjustTimers(-lostTime);
+               }
+
+               lastLoop = now;
        }
 }
 

diff --git a/lib/base/timer.cpp b/lib/base/timer.cpp
index ce24369088642fb7c7ed44c66be6e809e1e68a73..faa8cf1ebc64fb4881071cad514ba359876d3826 100644 (file)
--- a/lib/base/timer.cpp
+++ b/lib/base/timer.cpp
@@ -155,3 +155,16 @@ void Timer::Reschedule(double next)
 {
        m_Next = next;
 }
+
+/**
+ * Adjusts all timers by adding the specified amount of time to their
+ * next scheduled timestamp.
+ *
+ * @param adjustment The adjustment.
+ */
+void Timer::AdjustTimers(double adjustment)
+{
+       BOOST_FOREACH(Timer::Ptr timer, m_Timers) {
+               timer->m_Next += adjustment;
+       }
+}

diff --git a/lib/base/timer.h b/lib/base/timer.h
index 2cde7360ed1b1aa1841af393da79ea88f55e08a5..ab32c624cb8cdd84e81294f2f90641b9922d33ba 100644 (file)
--- a/lib/base/timer.h
+++ b/lib/base/timer.h
@@ -43,6 +43,7 @@ public:
        double GetInterval(void) const;
 
        static double ProcessTimers(void);
+       static void AdjustTimers(double adjustment);
 
        void Start(void);
        void Stop(void);