diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-08-03 19:24:04 +0300 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-07-07 18:10:06 +0300 |
commit | 7c117281bc8d53d9d6a1e3a9ff9760a5a5b44cf8 (patch) | |
tree | b94bade3a59aceaba9fb5117411ce850006de123 /platform | |
parent | 6b5f8fd6ef845fbf834968d94ec26cf26f645838 (diff) | |
download | qtlocation-mapboxgl-7c117281bc8d53d9d6a1e3a9ff9760a5a5b44cf8.tar.gz |
[core] Isolate pthread-based tls implementation
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/config.cmake | 1 | ||||
-rw-r--r-- | platform/default/thread_local.cpp | 62 | ||||
-rw-r--r-- | platform/ios/config.cmake | 1 | ||||
-rw-r--r-- | platform/linux/config.cmake | 1 | ||||
-rw-r--r-- | platform/macos/config.cmake | 1 | ||||
-rw-r--r-- | platform/qt/qt.cmake | 3 |
6 files changed, 69 insertions, 0 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index a7370da5fd..5a6950a23f 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -55,6 +55,7 @@ macro(mbgl_platform_core) PRIVATE platform/android/src/thread.cpp PRIVATE platform/default/string_stdlib.cpp PRIVATE platform/default/bidi.cpp + PRIVATE platform/default/thread_local.cpp PRIVATE platform/default/utf.cpp # Image handling diff --git a/platform/default/thread_local.cpp b/platform/default/thread_local.cpp new file mode 100644 index 0000000000..b754a04b7d --- /dev/null +++ b/platform/default/thread_local.cpp @@ -0,0 +1,62 @@ +#include <mbgl/util/thread_local.hpp> + +#include <mbgl/map/backend_scope.hpp> +#include <mbgl/util/logging.hpp> +#include <mbgl/util/run_loop.hpp> + +#include <stdexcept> +#include <cassert> + +#include <pthread.h> + +namespace mbgl { +namespace util { + +template <class T> +class ThreadLocal<T>::Impl { +public: + pthread_key_t key; +}; + +template <class T> +ThreadLocal<T>::ThreadLocal() : impl(std::make_unique<Impl>()) { + int ret = pthread_key_create(&impl->key, [](void *) {}); + + if (ret) { + throw std::runtime_error("Failed to init local storage key."); + } +} + +template <class T> +ThreadLocal<T>::~ThreadLocal() { + delete get(); + + if (pthread_key_delete(impl->key)) { + Log::Error(Event::General, "Failed to delete local storage key."); + assert(false); + } +} + +template <class T> +T* ThreadLocal<T>::get() { + auto* ret = reinterpret_cast<T*>(pthread_getspecific(impl->key)); + if (!ret) { + return nullptr; + } + + return ret; +} + +template <class T> +void ThreadLocal<T>::set(T* ptr) { + if (pthread_setspecific(impl->key, ptr)) { + throw std::runtime_error("Failed to set local storage."); + } +} + +template class ThreadLocal<RunLoop>; +template class ThreadLocal<BackendScope>; +template class ThreadLocal<int>; // For unit tests + +} // namespace util +} // namespace mbgl diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index fdb286a6d1..401a0e202a 100644 --- a/platform/ios/config.cmake +++ b/platform/ios/config.cmake @@ -41,6 +41,7 @@ macro(mbgl_platform_core) PRIVATE platform/darwin/src/nsthread.mm PRIVATE platform/darwin/src/string_nsstring.mm PRIVATE platform/default/bidi.cpp + PRIVATE platform/default/thread_local.cpp PRIVATE platform/default/utf.cpp # Image handling diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake index 41e7f71b99..d16842c201 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -69,6 +69,7 @@ macro(mbgl_platform_core) PRIVATE platform/default/string_stdlib.cpp PRIVATE platform/default/thread.cpp PRIVATE platform/default/bidi.cpp + PRIVATE platform/default/thread_local.cpp PRIVATE platform/default/utf.cpp # Image handling diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake index 8dc3c38245..e0edc90a6a 100644 --- a/platform/macos/config.cmake +++ b/platform/macos/config.cmake @@ -37,6 +37,7 @@ macro(mbgl_platform_core) PRIVATE platform/darwin/src/nsthread.mm PRIVATE platform/darwin/src/string_nsstring.mm PRIVATE platform/default/bidi.cpp + PRIVATE platform/default/thread_local.cpp PRIVATE platform/default/utf.cpp # Image handling diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index e5b96bfe93..9febee88b5 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -36,6 +36,9 @@ set(MBGL_QT_FILES PRIVATE platform/default/mbgl/util/default_thread_pool.cpp PRIVATE platform/default/mbgl/util/default_thread_pool.hpp + # Thread + PRIVATE platform/default/thread_local.cpp + # Platform integration PRIVATE platform/qt/src/async_task.cpp PRIVATE platform/qt/src/async_task_impl.hpp |