summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-03-03 13:01:09 +0100
committerKonstantin Käfer <mail@kkaefer.com>2014-03-03 13:01:09 +0100
commitf1f146b01e190570e4308a8781ae18f6931c7948 (patch)
treec994bfea2eb837e3b3b2a9854ca1d3fc07c606f8
parentf850856cecf3358f5cf63a8cfae00a1bd65a6d8e (diff)
downloadqtlocation-mapboxgl-f1f146b01e190570e4308a8781ae18f6931c7948.tar.gz
remove thread naming
-rw-r--r--include/llmr/util/threadpool.hpp5
-rw-r--r--src/util/threadpool.cpp9
2 files changed, 5 insertions, 9 deletions
diff --git a/include/llmr/util/threadpool.hpp b/include/llmr/util/threadpool.hpp
index 817cdc6515..88b9df1a30 100644
--- a/include/llmr/util/threadpool.hpp
+++ b/include/llmr/util/threadpool.hpp
@@ -4,8 +4,6 @@
#include <pthread.h>
#include <forward_list>
#include <queue>
-#include <string>
-#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 31d4fdc39f..3b69302b16 100644
--- a/src/util/threadpool.cpp
+++ b/src/util/threadpool.cpp
@@ -1,4 +1,5 @@
#include <llmr/util/threadpool.hpp>
+#include <llmr/util/std.hpp>
#include <thread>
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<Worker *>(ptr);
Threadpool& pool = worker->pool;
- pthread_setname_np(worker->name.c_str());
pthread_mutex_lock(&pool.mutex);
while (true) {
if (pool.tasks.size()) {