tweak timer start() initialization code layout

AntelopeIO · Jan 27, 2025 · 206b723 · 206b723
1 parent a0414e8
commit 206b723
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/libraries/chain/platform_timer_asio_fallback.cpp b/libraries/chain/platform_timer_asio_fallback.cpp
@@ -57,9 +57,9 @@ platform_timer::~platform_timer() {
 
 void platform_timer::start(fc::time_point tp) {
    assert(_state == state_t::stopped);
-   if(tp == fc::time_point::maximum()) {
+   timer_running_forever = tp == fc::time_point::maximum();
+   if(timer_running_forever) {
       _state = state_t::running;
-      timer_running_forever = true;
       return;
    }
    fc::microseconds x = tp.time_since_epoch() - fc::time_point::now().time_since_epoch();

diff --git a/libraries/chain/platform_timer_kqueue.cpp b/libraries/chain/platform_timer_kqueue.cpp
@@ -89,9 +89,9 @@ platform_timer::~platform_timer() {
 
 void platform_timer::start(fc::time_point tp) {
    assert(_state == state_t::stopped);
-   if(tp == fc::time_point::maximum()) {
+   timer_running_forever = tp == fc::time_point::maximum();
+   if(timer_running_forever) {
       _state = state_t::running;
-      timer_running_forever = true;
       return;
    }
    fc::microseconds x = tp.time_since_epoch() - fc::time_point::now().time_since_epoch();

diff --git a/libraries/chain/platform_timer_posix.cpp b/libraries/chain/platform_timer_posix.cpp
@@ -56,13 +56,12 @@ platform_timer::~platform_timer() {
 
 void platform_timer::start(fc::time_point tp) {
    assert(_state == state_t::stopped);
-   if(tp == fc::time_point::maximum()) {
+   timer_running_forever = tp == fc::time_point::maximum();
+   if(timer_running_forever) {
       _state = state_t::running;
-      timer_running_forever = true;
       return;
    }
    fc::microseconds x = tp.time_since_epoch() - fc::time_point::now().time_since_epoch();
-   timer_running_forever = false;
    if(x.count() <= 0)
       _state = state_t::timed_out;
    else {