summaryrefslogtreecommitdiff
path: root/src/mbgl/actor
diff options
context:
space:
mode:
authorMike Morris <mikemorris@users.noreply.github.com>2016-10-12 17:28:22 -0400
committerMike Morris <mikemorris@users.noreply.github.com>2016-10-20 14:37:36 -0400
commit817c26111a0d6650e7ebae73e46621626106d0a7 (patch)
tree60a5206f2f7658b06b214d9b7435a65a243d6e83 /src/mbgl/actor
parentab85fdb4524788ce7279e8ac362a0c1edbd5d5df (diff)
downloadqtlocation-mapboxgl-817c26111a0d6650e7ebae73e46621626106d0a7.tar.gz
[core] [node] pass thread pool impl to Map constructor
Updates mbgl::Map constructor usage everywhere Adds NodeThreadPool implementation using AsyncQueue to call Nan::AsyncQueueWorker from main thread
Diffstat (limited to 'src/mbgl/actor')
-rw-r--r--src/mbgl/actor/thread_pool.cpp55
-rw-r--r--src/mbgl/actor/thread_pool.hpp27
2 files changed, 0 insertions, 82 deletions
diff --git a/src/mbgl/actor/thread_pool.cpp b/src/mbgl/actor/thread_pool.cpp
deleted file mode 100644
index 2995ed26ad..0000000000
--- a/src/mbgl/actor/thread_pool.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <mbgl/actor/thread_pool.hpp>
-#include <mbgl/actor/mailbox.hpp>
-
-namespace mbgl {
-
-ThreadPool::ThreadPool(std::size_t count) {
- threads.reserve(count);
- for (std::size_t i = 0; i < count; ++i) {
- threads.emplace_back([this] () {
- while (true) {
- std::unique_lock<std::mutex> lock(mutex);
-
- cv.wait(lock, [this] {
- return !queue.empty() || terminate;
- });
-
- if (terminate) {
- return;
- }
-
- auto mailbox = queue.front();
- queue.pop();
- lock.unlock();
-
- if (auto locked = mailbox.lock()) {
- locked->receive();
- }
- }
- });
- }
-}
-
-ThreadPool::~ThreadPool() {
- {
- std::lock_guard<std::mutex> lock(mutex);
- terminate = true;
- }
-
- cv.notify_all();
-
- for (auto& thread : threads) {
- thread.join();
- }
-}
-
-void ThreadPool::schedule(std::weak_ptr<Mailbox> mailbox) {
- {
- std::lock_guard<std::mutex> lock(mutex);
- queue.push(mailbox);
- }
-
- cv.notify_one();
-}
-
-} // namespace mbgl
diff --git a/src/mbgl/actor/thread_pool.hpp b/src/mbgl/actor/thread_pool.hpp
deleted file mode 100644
index a14d16d771..0000000000
--- a/src/mbgl/actor/thread_pool.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <mbgl/actor/scheduler.hpp>
-
-#include <condition_variable>
-#include <mutex>
-#include <queue>
-#include <thread>
-
-namespace mbgl {
-
-class ThreadPool : public Scheduler {
-public:
- ThreadPool(std::size_t count);
- ~ThreadPool() override;
-
- void schedule(std::weak_ptr<Mailbox>) override;
-
-private:
- std::vector<std::thread> threads;
- std::queue<std::weak_ptr<Mailbox>> queue;
- std::mutex mutex;
- std::condition_variable cv;
- bool terminate { false };
-};
-
-} // namespace mbgl