From 4365a0449cc7cba181357669774caf835f2ef9dd Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Fri, 22 Sep 2017 22:36:21 +0000 Subject: [sanitizer] Replace thread id with GetThreadSelf This allows to avoid constructor parameter git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@314040 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/sanitizer_common/sanitizer_common_libcdep.cc | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'lib/sanitizer_common/sanitizer_common_libcdep.cc') diff --git a/lib/sanitizer_common/sanitizer_common_libcdep.cc b/lib/sanitizer_common/sanitizer_common_libcdep.cc index ce6bff447..b10eaeb96 100644 --- a/lib/sanitizer_common/sanitizer_common_libcdep.cc +++ b/lib/sanitizer_common/sanitizer_common_libcdep.cc @@ -286,21 +286,20 @@ void MaybeStartBackgroudThread() { #endif } -static const u32 kUnclaimedTid = 0xfffffe; -static atomic_uint32_t reporting_thread_tid = {kUnclaimedTid}; +static atomic_uintptr_t reporting_thread = {0}; -ScopedErrorReportLock::ScopedErrorReportLock(u32 current_tid) { +ScopedErrorReportLock::ScopedErrorReportLock() { + uptr current = GetThreadSelf(); for (;;) { - u32 expected_tid = kUnclaimedTid; - if (current_tid == kUnclaimedTid || - atomic_compare_exchange_strong(&reporting_thread_tid, &expected_tid, - current_tid, memory_order_relaxed)) { - // We've claimed reporting_thread_tid_ so proceed. + uptr expected = 0; + if (atomic_compare_exchange_strong(&reporting_thread, &expected, current, + memory_order_relaxed)) { + // We've claimed reporting_thread so proceed. CommonSanitizerReportMutex.Lock(); return; } - if (expected_tid == current_tid) { + if (expected == current) { // This is either asynch signal or nested error during error reporting. // Fail simple to avoid deadlocks in Report(). @@ -320,7 +319,7 @@ ScopedErrorReportLock::ScopedErrorReportLock(u32 current_tid) { ScopedErrorReportLock::~ScopedErrorReportLock() { CommonSanitizerReportMutex.Unlock(); - atomic_store_relaxed(&reporting_thread_tid, kUnclaimedTid); + atomic_store_relaxed(&reporting_thread, 0); } } // namespace __sanitizer -- cgit v1.2.3