diff options
author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-14 10:26:51 +0100 |
---|---|---|
committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-04-14 11:15:56 +0100 |
commit | 1cbf18ff8463946aa5a09ccf1d6873b222b912b6 (patch) | |
tree | eb7921b1b2099a3d34928841734010d6e3f7701e | |
parent | Global worker instance (diff) | |
download | ilt-1cbf18ff8463946aa5a09ccf1d6873b222b912b6.tar.bz2 ilt-1cbf18ff8463946aa5a09ccf1d6873b222b912b6.tar.xz ilt-1cbf18ff8463946aa5a09ccf1d6873b222b912b6.zip |
Simplify worker with jthread
Moves thread collection to bottom of class so threads are joined before
job storage is destroyed.
-rw-r--r-- | lib/work.h | 12 | ||||
-rw-r--r-- | lib/worker.cpp | 5 | ||||
-rw-r--r-- | lib/worker.h | 4 |
3 files changed, 3 insertions, 18 deletions
diff --git a/lib/work.h b/lib/work.h deleted file mode 100644 index c780e13..0000000 --- a/lib/work.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include <special_members.hpp> - -class Work { -public: - virtual ~Work() = default; - NO_COPY(Work); - NO_MOVE(Work); - - virtual void doWork() = 0; -}; diff --git a/lib/worker.cpp b/lib/worker.cpp index cf59f56..4f1352d 100644 --- a/lib/worker.cpp +++ b/lib/worker.cpp @@ -9,16 +9,13 @@ Worker Worker::instance; Worker::Worker() : todoLen {0} { std::generate_n(std::back_inserter(threads), std::thread::hardware_concurrency(), [this]() { - return std::thread {&Worker::worker, this}; + return std::jthread {&Worker::worker, this}; }); } Worker::~Worker() { todoLen.release(std::thread::hardware_concurrency()); - std::for_each(threads.begin(), threads.end(), [](auto & th) { - th.join(); - }); } void diff --git a/lib/worker.h b/lib/worker.h index 136c50e..96593d9 100644 --- a/lib/worker.h +++ b/lib/worker.h @@ -33,13 +33,13 @@ private: private: void worker(); - using Threads = std::vector<std::thread>; + using Threads = std::vector<std::jthread>; using ToDo = std::deque<WorkPtr>; - Threads threads; ToDo todo; std::counting_semaphore<16> todoLen; std::mutex todoMutex; + Threads threads; static Worker instance; }; |