aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-07-10 03:06:33 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-07-10 03:06:33 +0000
commitc05ce3ef5b225bcdfec2c570491d5353ec3fb8d4 (patch)
tree8d5b09118c1f98d50d1a0cd4329f4ceb922f9513
parent8848e127c7aa9a7964c06cea0f4429b825e454f1 (diff)
parent358c8c95725380eafe9f2aed0a4e2542592e85ff (diff)
downloadandroid_bionic-c05ce3ef5b225bcdfec2c570491d5353ec3fb8d4.tar.gz
android_bionic-c05ce3ef5b225bcdfec2c570491d5353ec3fb8d4.tar.bz2
android_bionic-c05ce3ef5b225bcdfec2c570491d5353ec3fb8d4.zip
Snap for 5715871 from 358c8c95725380eafe9f2aed0a4e2542592e85ff to qt-qpr1-release
Change-Id: I67c50098aba9d711bf100e72fa95763ba844a9d3
-rw-r--r--libc/bionic/jemalloc_wrapper.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/libc/bionic/jemalloc_wrapper.cpp b/libc/bionic/jemalloc_wrapper.cpp
index bf0494dde..7d0445784 100644
--- a/libc/bionic/jemalloc_wrapper.cpp
+++ b/libc/bionic/jemalloc_wrapper.cpp
@@ -107,9 +107,8 @@ int je_mallopt(int param, int value) {
// 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);