ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix global pointing to local variable."

Browse source
This commit is contained in:
Christopher Ferris 2014-01-29 06:29:58 +00:00 • committed by Gerrit Code Review
commit a152ed734f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libbacktrace/UnwindMap.cpp
View file

@ -33,7 +33,7 @@
// of maps using the same map cursor. // of maps using the same map cursor.
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
static pthread_mutex_t g_map_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t g_map_mutex = PTHREAD_MUTEX_INITIALIZER;
static unw_map_cursor_t* g_map_cursor = NULL; static unw_map_cursor_t g_map_cursor;
static int g_map_references = 0; static int g_map_references = 0;
UnwindMap::UnwindMap(pid_t pid) : BacktraceMap(pid) { UnwindMap::UnwindMap(pid_t pid) : BacktraceMap(pid) {
@ -64,11 +64,11 @@ bool UnwindMap::Build() {
// Set the local address space to this cursor map. // Set the local address space to this cursor map.
unw_map_set(unw_local_addr_space, &map_cursor_); unw_map_set(unw_local_addr_space, &map_cursor_);
g_map_references = 1; g_map_references = 1;
g_map_cursor = &map_cursor_; g_map_cursor = map_cursor_;
} }
} else { } else {
g_map_references++; g_map_references++;
map_cursor_ = *g_map_cursor; map_cursor_ = g_map_cursor;
} }
pthread_mutex_unlock(&g_map_mutex); pthread_mutex_unlock(&g_map_mutex);
} else { } else {