commit 9b78aa3529f15190f451a0852c8d58982dbc0721
author Christopher Ferris <cferris@google.com> Mon Mar 18 20:40:26 2019 -0700
committer Christopher Ferris <cferris@google.com> Mon Mar 18 21:45:36 2019 -0700
tree 84c536c0f7059686d8a0d791b2887894be891fc8
parent f3df0dae0b37e0bfce6d2a56436a14258cf94346

Increase num tries before failing.

Bug: 128872105

Test: Ran the android_mallopt.set_allocation_limit_multiple_threads test
Test: a thousand times on taimen.
Change-Id: I67a474c53cd6eda8106feac99aee8e7b0bee1254

libc/bionic/malloc_limit.cpp

diff --git a/libc/bionic/malloc_limit.cpp b/libc/bionic/malloc_limit.cpp
index b7e2146..69a8f89 100644
--- a/libc/bionic/malloc_limit.cpp
+++ b/libc/bionic/malloc_limit.cpp
@@ -275,7 +275,7 @@
   // being called, allow up to five ms for the signal handler to complete
   // before failing.
   bool enabled = false;
-  size_t max_tries = 5;
+  size_t num_tries = 10;
   while (true) {
     if (!atomic_exchange(&gGlobalsMutating, true)) {
       __libc_globals.mutate([](libc_globals* globals) {
@@ -285,7 +285,7 @@
       enabled = true;
       break;
     }
-    if (--max_tries == 0) {
+    if (--num_tries == 0) {
       break;
     }
     usleep(1000);