diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/core-files.json | 1 | ||||
| -rw-r--r-- | platform/default/src/mbgl/platform/thread_pool.cpp | 83 | ||||
| -rw-r--r-- | platform/ios/core-files.json | 1 | ||||
| -rw-r--r-- | platform/linux/config.cmake | 3 | ||||
| -rw-r--r-- | platform/macos/core-files.json | 1 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 3 |
6 files changed, 0 insertions, 92 deletions
diff --git a/platform/android/core-files.json b/platform/android/core-files.json index 78764e99bc..ba56695bdd 100644 --- a/platform/android/core-files.json +++ b/platform/android/core-files.json @@ -88,7 +88,6 @@ "platform/default/src/mbgl/gl/headless_backend.cpp", "platform/default/src/mbgl/gl/headless_frontend.cpp", "platform/default/src/mbgl/map/map_snapshotter.cpp", - "platform/default/src/mbgl/platform/thread_pool.cpp", "platform/default/src/mbgl/text/bidi.cpp", "platform/default/src/mbgl/util/png_writer.cpp", "platform/default/src/mbgl/util/thread_local.cpp", diff --git a/platform/default/src/mbgl/platform/thread_pool.cpp b/platform/default/src/mbgl/platform/thread_pool.cpp deleted file mode 100644 index d213aab71c..0000000000 --- a/platform/default/src/mbgl/platform/thread_pool.cpp +++ /dev/null @@ -1,83 +0,0 @@ -#include <mbgl/actor/scheduler.hpp> -#include <mbgl/actor/mailbox.hpp> -#include <mbgl/util/platform.hpp> -#include <mbgl/util/string.hpp> - -#include <condition_variable> -#include <mutex> -#include <queue> -#include <thread> - -namespace mbgl { - -class ThreadPool final : public Scheduler { -public: - explicit 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 }; -}; - -ThreadPool::ThreadPool(std::size_t count) { - threads.reserve(count); - - for (std::size_t i = 0; i < count; ++i) { - threads.emplace_back([this, i]() { - platform::setCurrentThreadName(std::string{ "Worker " } + util::toString(i + 1)); - - 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(); - - Mailbox::maybeReceive(mailbox); - } - }); - } -} - -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(); -} - -Scheduler& Scheduler::GetBackground() { - static std::unique_ptr<ThreadPool> pool(new ThreadPool(4)); - return *pool; -} - -} // namespace mbgl diff --git a/platform/ios/core-files.json b/platform/ios/core-files.json index 26a7857dd2..98833b0c94 100644 --- a/platform/ios/core-files.json +++ b/platform/ios/core-files.json @@ -13,7 +13,6 @@ "platform/default/src/mbgl/gl/headless_backend.cpp", "platform/default/src/mbgl/gl/headless_frontend.cpp", "platform/default/src/mbgl/map/map_snapshotter.cpp", - "platform/default/src/mbgl/platform/thread_pool.cpp", "platform/default/src/mbgl/text/bidi.cpp", "platform/default/src/mbgl/util/png_writer.cpp", "platform/default/src/mbgl/util/thread_local.cpp", diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index ef987533d8..7f8b382571 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -72,9 +72,6 @@ macro(mbgl_platform_core) # Snapshotting PRIVATE platform/default/src/mbgl/map/map_snapshotter.cpp PRIVATE platform/default/include/mbgl/map/map_snapshotter.hpp - - # Thread pool - PRIVATE platform/default/src/mbgl/platform/thread_pool.cpp ) target_include_directories(mbgl-core diff --git a/platform/macos/core-files.json b/platform/macos/core-files.json index eb9357bedb..abeda5796b 100644 --- a/platform/macos/core-files.json +++ b/platform/macos/core-files.json @@ -12,7 +12,6 @@ "platform/default/src/mbgl/gl/headless_backend.cpp", "platform/default/src/mbgl/gl/headless_frontend.cpp", "platform/default/src/mbgl/map/map_snapshotter.cpp", - "platform/default/src/mbgl/platform/thread_pool.cpp", "platform/default/src/mbgl/text/bidi.cpp", "platform/default/src/mbgl/util/png_writer.cpp", "platform/default/src/mbgl/util/thread_local.cpp", diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 2751ad1fad..1d0bb3d29c 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -17,9 +17,6 @@ set(MBGL_QT_CORE_FILES PRIVATE platform/default/include/mbgl/gl/headless_backend.hpp PRIVATE platform/qt/src/headless_backend_qt.cpp - # Thread pool - PRIVATE platform/default/src/mbgl/platform/thread_pool.cpp - # Thread PRIVATE platform/qt/src/thread_local.cpp |