generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Do not hold hash table lock while backtracing."

Browse Source
This commit is contained in:
Christopher Ferris 2015-07-13 20:27:37 +00:00 committed by Gerrit Code Review
commit 5e3dc45a16
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libc/bionic/malloc_debug_leak.cpp
View File

@ -133,8 +133,9 @@ static HashEntry* record_backtrace(uintptr_t* backtrace, size_t numEntries, size
size |= SIZE_FLAG_ZYGOTE_CHILD; size |= SIZE_FLAG_ZYGOTE_CHILD;
} }
// Keep the lock held for as little time as possible to prevent deadlocks.
ScopedPthreadMutexLocker locker(&g_hash_table->lock);
HashEntry* entry = find_entry(g_hash_table, slot, backtrace, numEntries, size); HashEntry* entry = find_entry(g_hash_table, slot, backtrace, numEntries, size);
if (entry != NULL) { if (entry != NULL) {
entry->allocations++; entry->allocations++;
} else { } else {
@ -302,8 +303,6 @@ extern "C" void* leak_malloc(size_t bytes) {
void* base = g_malloc_dispatch->malloc(size); void* base = g_malloc_dispatch->malloc(size);
if (base != NULL) { if (base != NULL) {
ScopedPthreadMutexLocker locker(&g_hash_table->lock);
uintptr_t backtrace[BACKTRACE_SIZE]; uintptr_t backtrace[BACKTRACE_SIZE];
size_t numEntries = GET_BACKTRACE(backtrace, BACKTRACE_SIZE); size_t numEntries = GET_BACKTRACE(backtrace, BACKTRACE_SIZE);
@ -328,8 +327,6 @@ extern "C" void leak_free(void* mem) {
return; return;
} }
ScopedPthreadMutexLocker locker(&g_hash_table->lock);
// check the guard to make sure it is valid // check the guard to make sure it is valid
AllocationEntry* header = to_header(mem); AllocationEntry* header = to_header(mem);
@ -342,6 +339,7 @@ extern "C" void leak_free(void* mem) {
} }
} }
ScopedPthreadMutexLocker locker(&g_hash_table->lock);
if (header->guard == GUARD || is_valid_entry(header->entry)) { if (header->guard == GUARD || is_valid_entry(header->entry)) {
// decrement the allocations // decrement the allocations
HashEntry* entry = header->entry; HashEntry* entry = header->entry;