diff options
author | Ivo van Dongen <info@ivovandongen.nl> | 2017-07-25 18:35:38 +0300 |
---|---|---|
committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2017-08-09 12:08:21 +0300 |
commit | f4f4d13b70cfc26e44c7cbc679acbe9609ae2936 (patch) | |
tree | f8dcd4f78ddf2f5d3e0227add7cd6bc3603515dd /platform/qt | |
parent | 2a8cc4b3e15037554fb357f882a67472adb4161e (diff) | |
download | qtlocation-mapboxgl-f4f4d13b70cfc26e44c7cbc679acbe9609ae2936.tar.gz |
[all] ensure runloop is the current scheduler
Diffstat (limited to 'platform/qt')
-rw-r--r-- | platform/qt/src/run_loop.cpp | 16 | ||||
-rw-r--r-- | platform/qt/src/thread_local.cpp | 4 |
2 files changed, 7 insertions, 13 deletions
diff --git a/platform/qt/src/run_loop.cpp b/platform/qt/src/run_loop.cpp index c44f284852..71ea19032a 100644 --- a/platform/qt/src/run_loop.cpp +++ b/platform/qt/src/run_loop.cpp @@ -1,6 +1,6 @@ #include "run_loop_impl.hpp" -#include <mbgl/util/thread_local.hpp> +#include <mbgl/actor/scheduler.hpp> #include <QCoreApplication> @@ -8,13 +8,6 @@ #include <functional> #include <utility> -namespace { - -using namespace mbgl::util; -static ThreadLocal<RunLoop>& current = *new ThreadLocal<RunLoop>; - -} - namespace mbgl { namespace util { @@ -27,7 +20,8 @@ void RunLoop::Impl::onWriteEvent(int fd) { } RunLoop* RunLoop::Get() { - return current.get(); + assert(static_cast<RunLoop*>(Scheduler::GetCurrent())); + return static_cast<RunLoop*>(Scheduler::GetCurrent()); } RunLoop::RunLoop(Type type) : impl(std::make_unique<Impl>()) { @@ -42,14 +36,14 @@ RunLoop::RunLoop(Type type) : impl(std::make_unique<Impl>()) { impl->type = type; - current.set(this); + Scheduler::SetCurrent(this); impl->async = std::make_unique<AsyncTask>(std::bind(&RunLoop::process, this)); } RunLoop::~RunLoop() { MBGL_VERIFY_THREAD(tid); - current.set(nullptr); + Scheduler::SetCurrent(nullptr); } LOOP_HANDLE RunLoop::getLoopHandle() { diff --git a/platform/qt/src/thread_local.cpp b/platform/qt/src/thread_local.cpp index bf2103c98f..467bfb0d05 100644 --- a/platform/qt/src/thread_local.cpp +++ b/platform/qt/src/thread_local.cpp @@ -1,6 +1,6 @@ #include <mbgl/util/thread_local.hpp> -#include <mbgl/util/run_loop.hpp> +#include <mbgl/actor/scheduler.hpp> #include <mbgl/renderer/backend_scope.hpp> #include <array> @@ -41,7 +41,7 @@ void ThreadLocal<T>::set(T* ptr) { impl->local.localData()[0] = ptr; } -template class ThreadLocal<RunLoop>; +template class ThreadLocal<Scheduler>; template class ThreadLocal<BackendScope>; template class ThreadLocal<int>; // For unit tests |