From 7c117281bc8d53d9d6a1e3a9ff9760a5a5b44cf8 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Wed, 3 Aug 2016 19:24:04 +0300 Subject: [core] Isolate pthread-based tls implementation --- platform/android/config.cmake | 1 + platform/default/thread_local.cpp | 62 +++++++++++++++++++++++++++++++++++++++ platform/ios/config.cmake | 1 + platform/linux/config.cmake | 1 + platform/macos/config.cmake | 1 + platform/qt/qt.cmake | 3 ++ 6 files changed, 69 insertions(+) create mode 100644 platform/default/thread_local.cpp (limited to 'platform') 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 + +#include +#include +#include + +#include +#include + +#include + +namespace mbgl { +namespace util { + +template +class ThreadLocal::Impl { +public: + pthread_key_t key; +}; + +template +ThreadLocal::ThreadLocal() : impl(std::make_unique()) { + int ret = pthread_key_create(&impl->key, [](void *) {}); + + if (ret) { + throw std::runtime_error("Failed to init local storage key."); + } +} + +template +ThreadLocal::~ThreadLocal() { + delete get(); + + if (pthread_key_delete(impl->key)) { + Log::Error(Event::General, "Failed to delete local storage key."); + assert(false); + } +} + +template +T* ThreadLocal::get() { + auto* ret = reinterpret_cast(pthread_getspecific(impl->key)); + if (!ret) { + return nullptr; + } + + return ret; +} + +template +void ThreadLocal::set(T* ptr) { + if (pthread_setspecific(impl->key, ptr)) { + throw std::runtime_error("Failed to set local storage."); + } +} + +template class ThreadLocal; +template class ThreadLocal; +template class ThreadLocal; // 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 -- cgit v1.2.1