Simplify thread class

Signed-off-by: Cornelius Claussen <cc@pionix.de>
EVerest · Oct 11, 2023 · 6e914cb · 6e914cb
1 parent eeeada9
commit 6e914cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/include/utils/thread.hpp b/include/utils/thread.hpp
@@ -10,7 +10,6 @@
 namespace Everest {
 class Thread {
 public:
-    Thread();
     ~Thread();
 
     void stop();
@@ -20,9 +19,7 @@ class Thread {
 
 private:
     std::thread handle;
-    std::promise<void> exitSignal;
-    std::future<void> exitFuture;
-    std::atomic_bool started;
+    std::atomic_bool exit_signal{false};
 };
 } // namespace Everest
 

diff --git a/lib/thread.cpp b/lib/thread.cpp
@@ -3,35 +3,26 @@
 #include <utils/thread.hpp>
 
 namespace Everest {
-Thread::Thread() {
-    exitFuture = exitSignal.get_future();
-    started = false;
-}
 
 Thread::~Thread() {
     stop();
 }
 
 void Thread::stop() {
-    if (started) {
-        exitSignal.set_value();
-        if (handle.joinable())
-            handle.join();
-        started = false;
+    if (handle.joinable()) {
+        exit_signal = true;
+        handle.join();
     }
+    exit_signal = false;
 }
 
 bool Thread::shouldExit() {
-    if (exitFuture.wait_for(std::chrono::seconds(0)) == std::future_status::ready) {
-        started = false;
-        return true;
-    }
-    return false;
+    return exit_signal;
 }
 
 void Thread::operator=(std::thread&& t) {
+    stop();
     handle = std::move(t);
-    started = true;
 }
 
 } // namespace Everest