From fefa77c42687417bf18405ed66ecffa0e978a943 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Fri, 19 Jul 2019 07:03:03 -0700 Subject: [PATCH] Add pthread thread-local storage support for ScopedYieldPolicy Emscripten does not support C++11 thread_local but does support the pthread TLS API. Bug: None Change-Id: Ia21895148d1df7652579d086d9e1c0c53d7a85f4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/145441 Commit-Queue: Steve Anton Reviewed-by: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#28621} --- rtc_base/synchronization/BUILD.gn | 2 + rtc_base/synchronization/yield_policy.cc | 60 ++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/rtc_base/synchronization/BUILD.gn b/rtc_base/synchronization/BUILD.gn index ba44c79d62..d510790cd4 100644 --- a/rtc_base/synchronization/BUILD.gn +++ b/rtc_base/synchronization/BUILD.gn @@ -56,6 +56,8 @@ rtc_source_set("yield_policy") { "yield_policy.h", ] deps = [ + "..:checks", + "//third_party/abseil-cpp/absl/base:config", "//third_party/abseil-cpp/absl/base:core_headers", ] } diff --git a/rtc_base/synchronization/yield_policy.cc b/rtc_base/synchronization/yield_policy.cc index 56159159c2..d883d42bf4 100644 --- a/rtc_base/synchronization/yield_policy.cc +++ b/rtc_base/synchronization/yield_policy.cc @@ -10,23 +10,73 @@ #include "rtc_base/synchronization/yield_policy.h" #include "absl/base/attributes.h" +#include "absl/base/config.h" +#include "rtc_base/checks.h" +#if !defined(ABSL_HAVE_THREAD_LOCAL) && defined(WEBRTC_POSIX) +#include +#endif namespace rtc { namespace { + +#if defined(ABSL_HAVE_THREAD_LOCAL) + ABSL_CONST_INIT thread_local YieldInterface* current_yield_policy = nullptr; + +YieldInterface* GetCurrentYieldPolicy() { + return current_yield_policy; } +void SetCurrentYieldPolicy(YieldInterface* ptr) { + current_yield_policy = ptr; +} + +#elif defined(WEBRTC_POSIX) + +// Emscripten does not support the C++11 thread_local keyword but does support +// the pthread thread-local storage API. +// https://github.com/emscripten-core/emscripten/issues/3502 + +ABSL_CONST_INIT pthread_key_t g_current_yield_policy_tls = 0; + +void InitializeTls() { + RTC_CHECK_EQ(pthread_key_create(&g_current_yield_policy_tls, nullptr), 0); +} + +pthread_key_t GetCurrentYieldPolicyTls() { + static pthread_once_t init_once = PTHREAD_ONCE_INIT; + RTC_CHECK_EQ(pthread_once(&init_once, &InitializeTls), 0); + return g_current_yield_policy_tls; +} + +YieldInterface* GetCurrentYieldPolicy() { + return static_cast( + pthread_getspecific(GetCurrentYieldPolicyTls())); +} + +void SetCurrentYieldPolicy(YieldInterface* ptr) { + pthread_setspecific(GetCurrentYieldPolicyTls(), ptr); +} + +#else +#error Unsupported platform +#endif + +} // namespace + ScopedYieldPolicy::ScopedYieldPolicy(YieldInterface* policy) - : previous_(current_yield_policy) { - current_yield_policy = policy; + : previous_(GetCurrentYieldPolicy()) { + SetCurrentYieldPolicy(policy); } ScopedYieldPolicy::~ScopedYieldPolicy() { - current_yield_policy = previous_; + SetCurrentYieldPolicy(previous_); } void ScopedYieldPolicy::YieldExecution() { - if (current_yield_policy) - current_yield_policy->YieldExecution(); + YieldInterface* current = GetCurrentYieldPolicy(); + if (current) + current->YieldExecution(); } + } // namespace rtc