From bb85ec442dd7b5b0966d73bc6b868d33bb03e5e9 Mon Sep 17 00:00:00 2001 From: Alexander Shalamov Date: Fri, 31 Jan 2020 17:06:37 +0200 Subject: [core] Add hooks for setting experimental thread priorities for mbgl threads --- src/core-files.json | 3 +++ src/mbgl/util/thread.cpp | 19 +++++++++++++++++++ src/mbgl/util/thread_pool.cpp | 11 +++++++++-- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 src/mbgl/util/thread.cpp (limited to 'src') diff --git a/src/core-files.json b/src/core-files.json index 3c0e128b18..fe68df16bf 100644 --- a/src/core-files.json +++ b/src/core-files.json @@ -62,6 +62,7 @@ "src/mbgl/map/transform_state.cpp", "src/mbgl/math/log2.cpp", "src/mbgl/platform/gl_functions.cpp", + "src/mbgl/platform/settings.cpp", "src/mbgl/programs/background_program.cpp", "src/mbgl/programs/circle_program.cpp", "src/mbgl/programs/clipping_mask_program.cpp", @@ -316,6 +317,7 @@ "src/mbgl/util/rapidjson.cpp", "src/mbgl/util/stopwatch.cpp", "src/mbgl/util/string.cpp", + "src/mbgl/util/thread.cpp", "src/mbgl/util/thread_pool.cpp", "src/mbgl/util/tile_cover.cpp", "src/mbgl/util/tile_cover_impl.cpp", @@ -369,6 +371,7 @@ "mbgl/math/minmax.hpp": "include/mbgl/math/minmax.hpp", "mbgl/math/wrap.hpp": "include/mbgl/math/wrap.hpp", "mbgl/platform/gl_functions.hpp": "include/mbgl/platform/gl_functions.hpp", + "mbgl/platform/settings.hpp": "include/mbgl/platform/settings.hpp", "mbgl/platform/thread.hpp": "include/mbgl/platform/thread.hpp", "mbgl/renderer/query.hpp": "include/mbgl/renderer/query.hpp", "mbgl/renderer/renderer.hpp": "include/mbgl/renderer/renderer.hpp", diff --git a/src/mbgl/util/thread.cpp b/src/mbgl/util/thread.cpp new file mode 100644 index 0000000000..016d23a928 --- /dev/null +++ b/src/mbgl/util/thread.cpp @@ -0,0 +1,19 @@ +#include +#include +#include + +namespace mbgl { +namespace util { +std::function makeThreadPrioritySetter(std::string threadType_) { + return [threadType = std::move(threadType_)] { + auto& settings = platform::Settings::getInstance(); + auto value = settings.get(threadType); + if (auto* priority = value.getDouble()) { + platform::setCurrentThreadPriority(*priority); + } else { + platform::makeThreadLowPriority(); + } + }; +} +} // namespace util +} // namespace mbgl diff --git a/src/mbgl/util/thread_pool.cpp b/src/mbgl/util/thread_pool.cpp index 040e996dd4..e1c18a45b5 100644 --- a/src/mbgl/util/thread_pool.cpp +++ b/src/mbgl/util/thread_pool.cpp @@ -1,8 +1,9 @@ #include +#include +#include #include #include -#include namespace mbgl { @@ -17,7 +18,13 @@ void ThreadedSchedulerBase::terminate() { } std::thread ThreadedSchedulerBase::makeSchedulerThread(size_t index) { - return std::thread([this, index]() { + return std::thread([this, index] { + auto& settings = platform::Settings::getInstance(); + auto value = settings.get(platform::EXPERIMENTAL_THREAD_PRIORITY_WORKER); + if (auto* priority = value.getDouble()) { + platform::setCurrentThreadPriority(*priority); + } + platform::setCurrentThreadName(std::string{"Worker "} + util::toString(index + 1)); platform::attachThread(); -- cgit v1.2.1