diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-08-03 19:56:10 +0300 |
---|---|---|
committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-09-08 18:17:33 -0700 |
commit | 8af0ed3e66cf69abc37cd4b9139287a84d4a697e (patch) | |
tree | 8d3603cb41d9fa425bccec89331d17cc88f6e4e0 | |
parent | 8802c65ec267494e66d8f16fddbb6905354b3e3b (diff) | |
download | qtlocation-mapboxgl-upstream/tmpsantos-thread_storage.tar.gz |
[Qt] Use QThreadStorage for thread localupstream/tmpsantos-thread_storage
Portable.
-rw-r--r-- | platform/qt/qt.cmake | 2 | ||||
-rw-r--r-- | platform/qt/src/thread_local.cpp | 43 |
2 files changed, 44 insertions, 1 deletions
diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 6ae90f4c55..6a89c23fb2 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -28,7 +28,7 @@ set(MBGL_QT_FILES # Misc PRIVATE platform/default/log_stderr.cpp - PRIVATE platform/default/thread_local.cpp + PRIVATE platform/qt/src/thread_local.cpp # Platform integration PRIVATE platform/qt/src/async_task.cpp diff --git a/platform/qt/src/thread_local.cpp b/platform/qt/src/thread_local.cpp new file mode 100644 index 0000000000..7608022ade --- /dev/null +++ b/platform/qt/src/thread_local.cpp @@ -0,0 +1,43 @@ +#include <mbgl/style/class_dictionary.hpp> +#include <mbgl/util/run_loop.hpp> +#include <mbgl/util/thread_local.hpp> + +#include <array> + +#include <QThreadStorage> + +namespace mbgl { +namespace util { + +template class ThreadLocal<RunLoop>; +template class ThreadLocal<int>; +template class ThreadLocal<style::ClassDictionary>; + +template <class T> +class ThreadLocal<T>::Impl { +public: + QThreadStorage<std::array<T*, 1>> local; +}; + +template <class T> +ThreadLocal<T>::ThreadLocal() : impl(std::make_unique<Impl>()) { + set(nullptr); +} + +template <class T> +ThreadLocal<T>::~ThreadLocal() { + delete get(); +} + +template <class T> +T* ThreadLocal<T>::get() { + return impl->local.localData()[0]; +} + +template <class T> +void ThreadLocal<T>::set(T* ptr) { + impl->local.localData()[0] = ptr; +} + +} // namespace util +} // namespace mbgl |