core: immediately call new entry

src/core/call_every_handler.cpp

@@ -6,11 +6,15 @@ CallEveryHandler::CallEveryHandler(Time& time) : _time(time) {}
 
 CallEveryHandler::~CallEveryHandler() {}
 
-void CallEveryHandler::add(std::function<void()> callback, float interval_s, void** cookie)
+void CallEveryHandler::add(std::function<void()> callback, double interval_s, void** cookie)
 {
     auto new_entry = std::make_shared<Entry>();
     new_entry->callback = callback;
-    new_entry->last_time = _time.steady_time();
+    auto before = _time.steady_time();
+    // Make sure it gets run straightaway. The epsilon seemed not enough so
+    // we use the arbitrary value of 1 ms.
+    _time.shift_steady_time_by(before, -interval_s - 0.001);
+    new_entry->last_time = before;
     new_entry->interval_s = interval_s;
 
     void* new_cookie = static_cast<void*>(new_entry.get());
@@ -25,7 +29,7 @@ void CallEveryHandler::add(std::function<void()> callback, float interval_s, voi
     }
 }
 
-void CallEveryHandler::change(float interval_s, const void* cookie)
+void CallEveryHandler::change(double interval_s, const void* cookie)
 {
     std::lock_guard<std::mutex> lock(_entries_mutex);
 

src/core/call_every_handler.h

@@ -19,8 +19,8 @@ class CallEveryHandler {
     CallEveryHandler& operator=(CallEveryHandler const&) = delete; // Copy assign
     CallEveryHandler& operator=(CallEveryHandler&&) = delete; // Move assign
 
-    void add(std::function<void()> callback, float interval_s, void** cookie);
-    void change(float interval_s, const void* cookie);
+    void add(std::function<void()> callback, double interval_s, void** cookie);
+    void change(double interval_s, const void* cookie);
     void reset(const void* cookie);
     void remove(const void* cookie);
 
@@ -30,7 +30,7 @@ class CallEveryHandler {
     struct Entry {
         std::function<void()> callback{nullptr};
         dl_time_t last_time{};
-        float interval_s{0.0f};
+        double interval_s{0.0f};
     };
 
     std::unordered_map<void*, std::shared_ptr<Entry>> _entries{};

src/core/call_every_handler_test.cpp

@@ -24,7 +24,7 @@ TEST(CallEveryHandler, Single)
         time.sleep_for(std::chrono::milliseconds(10));
         ceh.run_once();
     }
-    EXPECT_EQ(num_called, 1);
+    EXPECT_EQ(num_called, 2);
 
     UNUSED(cookie);
 }
@@ -40,8 +40,8 @@ TEST(CallEveryHandler, Multiple)
     ceh.add([&num_called]() { ++num_called; }, 0.1f, &cookie);
 
     for (int i = 0; i < 10; ++i) {
-        time.sleep_for(std::chrono::milliseconds(100));
         ceh.run_once();
+        time.sleep_for(std::chrono::milliseconds(100));
     }
     EXPECT_EQ(num_called, 10);
 
@@ -76,8 +76,8 @@ TEST(CallEveryHandler, InParallel)
     ceh.add([&num_called2]() { ++num_called2; }, 0.2f, &cookie2);
 
     for (int i = 0; i < 10; ++i) {
-        time.sleep_for(std::chrono::milliseconds(100));
         ceh.run_once();
+        time.sleep_for(std::chrono::milliseconds(100));
     }
 
     EXPECT_EQ(num_called1, 10);
@@ -90,8 +90,8 @@ TEST(CallEveryHandler, InParallel)
     ceh.change(0.1f, cookie2);
 
     for (int i = 0; i < 10; ++i) {
-        time.sleep_for(std::chrono::milliseconds(100));
         ceh.run_once();
+        time.sleep_for(std::chrono::milliseconds(100));
     }
 
     EXPECT_EQ(num_called1, 2);
@@ -109,23 +109,37 @@ TEST(CallEveryHandler, Reset)
     ceh.add([&num_called]() { ++num_called; }, 0.1f, &cookie);
 
     for (int i = 0; i < 8; ++i) {
-        time.sleep_for(std::chrono::milliseconds(10));
         ceh.run_once();
-        if (i == 8) {
-        }
+        time.sleep_for(std::chrono::milliseconds(10));
     }
-    EXPECT_EQ(num_called, 0);
+    EXPECT_EQ(num_called, 1);
 
     ceh.reset(cookie);
 
     for (int i = 0; i < 8; ++i) {
-        time.sleep_for(std::chrono::milliseconds(10));
         ceh.run_once();
+        time.sleep_for(std::chrono::milliseconds(10));
     }
-    EXPECT_EQ(num_called, 0);
+    EXPECT_EQ(num_called, 1);
 
     for (int i = 0; i < 3; ++i) {
+        ceh.run_once();
         time.sleep_for(std::chrono::milliseconds(10));
+    }
+    EXPECT_EQ(num_called, 2);
+}
+
+TEST(CallEveryHandler, CallImmediately)
+{
+    Time time{};
+    CallEveryHandler ceh(time);
+
+    int num_called = 0;
+
+    void* cookie = nullptr;
+    ceh.add([&num_called]() { ++num_called; }, 0.1f, &cookie);
+
+    for (int i = 0; i < 1; ++i) {
         ceh.run_once();
     }
     EXPECT_EQ(num_called, 1);