Save

victimsnino · May 22, 2023 · 4bdb7b2 · 4bdb7b2
1 parent 60c30ed
commit 4bdb7b2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/rpp/rpp/schedulers/details/queue.hpp b/src/rpp/rpp/schedulers/details/queue.hpp
@@ -78,7 +78,7 @@ class specific_schedulable final : public schedulable_base
             return std::nullopt;
         }
     }
-    bool              is_disposed() const override { return std::get<0>(m_args).is_disposed(); }
+    bool is_disposed() const override { return std::get<0>(m_args).is_disposed(); }
 
 private:
     std::tuple<TObs, Args...> m_args;

diff --git a/src/rpp/rpp/schedulers/new_thread.hpp b/src/rpp/rpp/schedulers/new_thread.hpp
@@ -76,13 +76,17 @@ class new_thread
                     if (is_disposed.test(std::memory_order_relaxed))
                         break;
 
-                    if (!cv.wait_until(lock,
-                                       queue_ptr->top()->get_timepoint(),
-                                       [&]
-                                       {
-                                           return is_disposed.test(std::memory_order_relaxed) || queue_ptr->top()->get_timepoint() <= clock_type::now();
-                                       }))
+                    if (queue_ptr->top()->is_disposed())
+                    {
+                        queue_ptr->pop();
                         continue;
+                    }
+
+                    if (const auto now = clock_type::now(); now < queue_ptr->top()->get_timepoint())
+                    {
+                        cv.wait_for(lock, queue_ptr->top()->get_timepoint() - now);
+                        continue;
+                    }
 
                     auto top = queue_ptr->pop();