luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #161 from mpercy/thread-local-libunwind-2

Browse Source 
Use thread local for libunwind GetStackTrace() reentrancy protection
This commit is contained in:
Sergiu Deitsch 2019-10-31 22:54:34 +01:00 committed by GitHub
commit f17d11aa8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/stacktrace_libunwind-inl.h
View File

@ -49,7 +49,9 @@ _START_GOOGLE_NAMESPACE_
// recursive request, we'd end up with infinite recursion or deadlock.
// Luckily, it's safe to ignore those subsequent traces. In such
// cases, we return 0 to indicate the situation.
static bool g_now_entering = false;
// We can use the GCC __thread syntax here since libunwind is not supported on
// Windows.
static __thread bool g_tl_entered; // Initialized to false.
// If you change this function, also change GetStackFrames below.
int GetStackTrace(void** result, int max_depth, int skip_count) {
@ -58,9 +60,10 @@ int GetStackTrace(void** result, int max_depth, int skip_count) {
unw_cursor_t cursor;
unw_context_t uc;
if (sync_val_compare_and_swap(&g_now_entering, false, true)) {
if (g_tl_entered) {
return 0;
}
g_tl_entered = true;
unw_getcontext(&uc);
RAW_CHECK(unw_init_local(&cursor, &uc) >= 0, "unw_init_local failed");
@ -80,7 +83,7 @@ int GetStackTrace(void** result, int max_depth, int skip_count) {
break;
}
g_now_entering = false;
g_tl_entered = false;
return n;
}