tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "malloc_heapprofd: Avoid a spurious error log" am: 456eed0638

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1846387

Change-Id: I84faefcf72613f67c6270921e948e95fde38fc1e
This commit is contained in:
Daniele Di Proietto 2021-10-11 10:37:42 +00:00 committed by Automerger Merge Worker
commit cdeddf033b
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libc/bionic/malloc_heapprofd.cpp
View file

@ -273,6 +273,11 @@ void HandleHeapprofdSignal() {
atomic_store(&gPreviousDefaultDispatchTable, nullptr);
gEphemeralDispatch = *NativeAllocatorDispatch();
}
} else if (expected == kEphemeralHookInstalled) {
// Nothing to do here. The ephemeral hook was installed, but
// MallocInitHeapprofdHook() was never called. Since the ephemeral hook
// is already there, no need to reinstall it.
return;
} else if (atomic_compare_exchange_strong(&gHeapprofdState, &expected2,
kInstallingEphemeralHook)) {
// if we still have hook installed, we can reuse the previous