Use monotonic clock in Timer class

This fixes side effects when system time changes.

Use monotonic clock in Timer class
This fixes side effects when system time changes.
Wiebe Cazemier
1 parent fc2ba5b6
Showing 4 changed files with 4 additions and 16 deletions
timer.cpp
timer.h
utils.cpp
utils.h
@@ -24,16 +24,13 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
 void CallbackEntry::updateExectedAt()
 {
-    this->lastExecuted = currentMSecsSinceEpoch();
+    this->lastExecuted = std::chrono::steady_clock::now();
 }
 uint64_t CallbackEntry::getNextCallMs() const
 {
-    int64_t elapsedSinceLastCall = currentMSecsSinceEpoch() - lastExecuted;
-    if (elapsedSinceLastCall < 0) // Correct for clock drift
-        elapsedSinceLastCall = 0;
-
-    int64_t newDelay = this->interval - elapsedSinceLastCall;
+    const std::chrono::milliseconds elapsedSinceLastCall = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - lastExecuted);
+    int64_t newDelay = this->interval - elapsedSinceLastCall.count();
     if (newDelay < 0)
         newDelay = 0;
     return newDelay;
@@ -29,7 +29,7 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
 struct CallbackEntry
 {
-    uint64_t lastExecuted = currentMSecsSinceEpoch(); // assume the first one executed to avoid instantly calling it.
+    std::chrono::time_point<std::chrono::steady_clock> lastExecuted = std::chrono::steady_clock::now();
     uint64_t interval = 0;
     std::function<void ()> f = nullptr;
     std::string name;
@@ -294,14 +294,6 @@ bool startsWith(const std::string &amp;s, const std::string &amp;needle)
     return s.find(needle) == 0;
 }
-int64_t currentMSecsSinceEpoch()
-{
-    struct timeval te;
-    gettimeofday(&te, NULL);
-    int64_t milliseconds = te.tv_sec*1000LL + te.tv_usec/1000;
-    return milliseconds;
-}
-
 std::string getSecureRandomString(const ssize_t len)
 {
     std::vector<unsigned char> buf(len);
@@ -65,7 +65,6 @@ void rtrim(std::string &amp;s);
 void trim(std::string &s);
 bool startsWith(const std::string &s, const std::string &needle);
-int64_t currentMSecsSinceEpoch();
 std::string getSecureRandomString(const ssize_t len);
 std::string str_tolower(std::string s);
 bool stringTruthiness(const std::string &val);