Merge pull request #67 from basiliscos/v0.35-dev

v0.35 dev

Author: basiliscos

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15)
 
 cmake_policy(SET CMP0074 NEW)
 
-set(ROTOR_VERSION "0.34")
+set(ROTOR_VERSION "0.35")
 project (rotor LANGUAGES CXX VERSION ${ROTOR_VERSION})
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/")
 

README.md

@@ -67,6 +67,9 @@ project.
 
 ## Changelog
 
+### 0.35 (07-Oct-2025)
+ - [breaking] asio supervisor uses steady clock instead of system clock (aka deadline_timer)
+
 ### 0.34 (25-Mar-2025)
  - [feature] improve c++20 support
  - [workaround, fltk] more realiable message delivery for fltk backend. Fltk

docs/Changelog.md

@@ -4,6 +4,9 @@
 [reliable]: https://en.wikipedia.org/wiki/Reliability_(computer_networking) "reliable"
 [request-response]: https://en.wikipedia.org/wiki/Request%E2%80%93response
 
+### 0.35 (07-Oct-2025)
+ - [breaking] asio supervisor uses steady clock instead of system clock (aka deadline_timer)
+
 ### 0.34 (25-Mar-2025)
  - [feature] improve c++20 support
  - [workaround, fltk] more realiable message delivery for fltk backend. Fltk

include/rotor/asio/supervisor_asio.h

@@ -1,7 +1,7 @@
 #pragma once
 
 //
-// Copyright (c) 2019-2022 Ivan Baidakou (basiliscos) (the dot dmol at gmail dot com)
+// Copyright (c) 2019-2025 Ivan Baidakou (basiliscos) (the dot dmol at gmail dot com)
 //
 // Distributed under the MIT Software License
 //
@@ -90,15 +90,15 @@ struct ROTOR_ASIO_API supervisor_asio_t : public supervisor_t {
 
   protected:
     /** \struct timer_t
-     * \brief boos::asio::deadline_timer with embedded timer handler */
-    struct timer_t : public asio::deadline_timer {
+     * \brief boos::asio::steady_timer with embedded timer handler */
+    struct  timer_t : public asio::steady_timer {
 
         /** \brief non-owning pointer to timer handler */
         timer_handler_base_t *handler;
 
         /** \brief constructs timer using timer handler and boost asio io_context */
         timer_t(timer_handler_base_t *handler_, asio::io_context &io_context)
-            : asio::deadline_timer(io_context), handler{handler_} {}
+            : asio::steady_timer(io_context), handler{handler_} {}
     };
 
     /** \brief unique pointer to timer */

src/rotor/asio/supervisor_asio.cpp

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019-2022 Ivan Baidakou (basiliscos) (the dot dmol at gmail dot com)
+// Copyright (c) 2019-2025 Ivan Baidakou (basiliscos) (the dot dmol at gmail dot com)
 //
 // Distributed under the MIT Software License
 //
@@ -40,8 +40,10 @@ void supervisor_asio_t::start() noexcept { create_forwarder (&supervisor_asio_t:
 void supervisor_asio_t::shutdown() noexcept { create_forwarder (&supervisor_asio_t::invoke_shutdown)(); }
 
 void supervisor_asio_t::do_start_timer(const pt::time_duration &interval, timer_handler_base_t &handler) noexcept {
-    auto timer = std::make_unique<supervisor_asio_t::timer_t>(&handler, strand->context());
-    timer->expires_from_now(interval);
+    using namespace asio::chrono;
+    auto timer = std::make_unique<timer_t>(&handler, strand->context());
+    auto micro_seconds = microseconds(interval.total_microseconds());
+    timer->expires_after(duration_cast<timer_t::duration>(micro_seconds));
 
     intrusive_ptr_t<supervisor_asio_t> self(this);
     request_id_t timer_id = handler.request_id;

tests/104-asio_timer.cpp

@@ -47,6 +47,22 @@ struct bad_actor_t : public r::actor_base_t {
     }
 };
 
+struct timer_actor_t: r::actor_base_t {
+    using r::actor_base_t::actor_base_t;
+    void on_start() noexcept override {
+        r::actor_base_t::on_start();
+        auto timeout = r::pt::time_duration{r::pt::seconds{-1}};
+        auto req_id = start_timer(timeout, *this, &timer_actor_t::on_timer);
+    }
+
+    void on_timer(r::request_id_t req, bool cancelled){
+        timer_triggered = true;
+        do_shutdown();
+    }
+
+    bool timer_triggered = false;
+};
+
 TEST_CASE("timer", "[supervisor][asio]") {
     asio::io_context io_context{1};
     auto timeout = r::pt::milliseconds{10};
@@ -68,3 +84,24 @@ TEST_CASE("timer", "[supervisor][asio]") {
     REQUIRE(sup->get_leader_queue().size() == 0);
     CHECK(rt::empty(sup->get_subscription()));
 }
+
+TEST_CASE("zero timeout", "[supervisor][asio]") {
+    asio::io_context io_context{1};
+    auto timeout = r::pt::milliseconds{10};
+    auto system_context = ra::system_context_asio_t::ptr_t{new ra::system_context_asio_t(io_context)};
+    auto strand = std::make_shared<asio::io_context::strand>(io_context);
+
+    auto sup = system_context->create_supervisor<rt::supervisor_asio_test_t>().strand(strand).timeout(timeout).finish();
+    auto actor = sup->create_actor<timer_actor_t>().timeout(timeout).autoshutdown_supervisor().finish();
+
+    sup->start();
+    io_context.run();
+
+    CHECK(actor->timer_triggered);
+
+    REQUIRE(static_cast<r::actor_base_t *>(actor.get())->access<rt::to::state>() == r::state_t::SHUT_DOWN);
+
+    REQUIRE(sup->get_state() == r::state_t::SHUT_DOWN);
+    REQUIRE(sup->get_leader_queue().size() == 0);
+    CHECK(rt::empty(sup->get_subscription()));
+}