diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-08-03 19:24:04 +0300 |
---|---|---|
committer | Thiago Marcos P. Santos <thiago@mapbox.com> | 2017-01-24 11:36:59 +0200 |
commit | dd530dba0ea578f54347b08502ef6b7a9c0b813e (patch) | |
tree | 95e92f63ac79c9616370ccb522fc6b36ef53cc74 /platform | |
parent | 37b748e546e8ab0f1d922891bcdf00906be5ac24 (diff) | |
download | qtlocation-mapboxgl-dd530dba0ea578f54347b08502ef6b7a9c0b813e.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 | 58 | ||||
-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, 64 insertions, 1 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index c3c461ffa1..790e1f8bb5 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -79,6 +79,7 @@ macro(mbgl_platform_core) PRIVATE platform/android/src/logging_android.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..098ed90a3f --- /dev/null +++ b/platform/default/thread_local.cpp @@ -0,0 +1,58 @@ +#include <mbgl/style/class_dictionary.hpp> +#include <mbgl/util/run_loop.hpp> +#include <mbgl/util/thread_local.hpp> + +#include <stdexcept> + +#include <pthread.h> + +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: + 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 reinterpret_cast<T *>(get()); + + if (pthread_key_delete(impl->key)) { + throw std::runtime_error("Failed to delete local storage key."); + } +} + +template <class T> +T* ThreadLocal<T>::get() { + T* 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."); + } +} + +} // namespace util +} // namespace mbgl diff --git a/platform/ios/config.cmake b/platform/ios/config.cmake index 1150171c54..6c8eb8e53b 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 13f3edb96f..bdd10c9b78 100644 --- a/platform/linux/config.cmake +++ b/platform/linux/config.cmake @@ -67,6 +67,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 d7a9c894b8..f92c5ae933 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 32ffe89bfe..b54bf88e8e 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -30,9 +30,10 @@ set(MBGL_QT_FILES # Misc PRIVATE platform/default/logging_stderr.cpp - # Thread pool + # Thread PRIVATE platform/default/mbgl/util/default_thread_pool.cpp PRIVATE platform/default/mbgl/util/default_thread_pool.cpp + PRIVATE platform/default/thread_local.cpp # Platform integration PRIVATE platform/qt/src/async_task.cpp |