commit 1b353a7b27d5d8446948149e4a505f097218702b
author android-build-team Robot <android-build-team-robot@google.com> Wed Jul 10 03:08:47 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jul 10 03:08:47 2019 +0000
tree 8d5b09118c1f98d50d1a0cd4329f4ceb922f9513
parent c1cf18ba82e2e26d34a313d8ddb27db507439322
parent 358c8c95725380eafe9f2aed0a4e2542592e85ff

Snap for 5716220 from 358c8c95725380eafe9f2aed0a4e2542592e85ff to qt-c2f2-release

Change-Id: Ic12d1bd51d7b2e6540111956676f7f34cddb025d

libc/bionic/jemalloc_wrapper.cpp

diff --git a/libc/bionic/jemalloc_wrapper.cpp b/libc/bionic/jemalloc_wrapper.cpp
index bf0494d..7d04457 100644
--- a/libc/bionic/jemalloc_wrapper.cpp
+++ b/libc/bionic/jemalloc_wrapper.cpp
@@ -107,9 +107,8 @@
     // clear the caches of other threads.
     // This must be done first so that cleared allocations get purged
     // in the next calls.
-    if (je_mallctl("thread.tcache.flush", nullptr, nullptr, nullptr, 0) != 0) {
-      return 0;
-    }
+    // Ignore the return call since this will fail if the tcache is disabled.
+    je_mallctl("thread.tcache.flush", nullptr, nullptr, nullptr, 0);
 
     unsigned narenas;
     size_t sz = sizeof(unsigned);