Skip to content

Fix tsan/asan/hwasan/etc failures on Android #2229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
charlesmunger wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Open

Fix tsan/asan/hwasan/etc failures on Android #2229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,15 +913,17 @@ void Initialize(int* argc, char** argv, void (*HelperPrintf)()) {
// Android 12 (API level 31) introduced zeroing of allocated memory in bionic
// as a hardening feature; however, this is not enabled for apps.
if (__builtin_available(android 31, *)) {
BM_CHECK_EQ(mallopt(M_BIONIC_ZERO_INIT, 0), 1);
// Not asserting on the return value, as sanitizers interpose the allocator
// and always return 0
(void)mallopt(M_BIONIC_ZERO_INIT, 0);
}

// The default configuration of bionic is to return pages to the OS as soon
// as they are freed. But application processes are configured to run with a
// delay before returning memory to avoid excessive faulting on repeated
// allocation and deallocation, which is common in repeated benchmark runs.
if (__builtin_available(android 27, *)) {
BM_CHECK_EQ(mallopt(M_DECAY_TIME, 1), 1);
(void)mallopt(M_DECAY_TIME, 1);
}
#endif
internal::HelperPrintf = HelperPrintf;
Expand Down