diff --git a/include/llmr/util/threadpool.hpp b/include/llmr/util/threadpool.hpp index 817cdc651..88b9df1a3 100644 --- a/include/llmr/util/threadpool.hpp +++ b/include/llmr/util/threadpool.hpp @@ -4,8 +4,6 @@ #include #include #include -#include -#include "std.hpp" namespace llmr { namespace util { @@ -14,13 +12,12 @@ class Threadpool { private: class Worker { public: - Worker(Threadpool& pool, const std::string name); + Worker(Threadpool& pool); ~Worker(); static void *loop(void *ptr); private: Threadpool& pool; - const std::string name; pthread_t thread; }; diff --git a/src/util/threadpool.cpp b/src/util/threadpool.cpp index 31d4fdc39..3b69302b1 100644 --- a/src/util/threadpool.cpp +++ b/src/util/threadpool.cpp @@ -1,4 +1,5 @@ #include +#include #include using namespace llmr::util; @@ -12,7 +13,7 @@ Threadpool::Threadpool(int max_workers) void Threadpool::add(Callback callback, void *data) { if (worker_count < max_workers) { worker_count++; - workers.emplace_front(*this, std::string("worker ") + std::to_string(worker_count)); + workers.emplace_front(*this); } pthread_mutex_lock(&mutex); @@ -21,9 +22,8 @@ void Threadpool::add(Callback callback, void *data) { pthread_cond_signal(&condition); } -Threadpool::Worker::Worker(Threadpool& pool, const std::string name) - : pool(pool), - name(name) { +Threadpool::Worker::Worker(Threadpool& pool) + : pool(pool) { pthread_create(&thread, nullptr, loop, (void *)this); } @@ -36,7 +36,6 @@ void *Threadpool::Worker::loop(void *ptr) { Worker *worker = static_cast(ptr); Threadpool& pool = worker->pool; - pthread_setname_np(worker->name.c_str()); pthread_mutex_lock(&pool.mutex); while (true) { if (pool.tasks.size()) {