diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-10 03:42:37 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-10 03:42:37 +0000 |
commit | 290c0cb5044b643e5d6cbcb1a5b275541ca3a89e (patch) | |
tree | e060019567adf0d4f64d6e60fbe6f82a5b715af4 | |
parent | 0c8310d45b71f94d158a9bcdfd8a0c82a6d69743 (diff) | |
parent | 5cda74e065761bbeccf7ff61d7a3131bdf6490d0 (diff) | |
download | android_bionic-290c0cb5044b643e5d6cbcb1a5b275541ca3a89e.tar.gz android_bionic-290c0cb5044b643e5d6cbcb1a5b275541ca3a89e.tar.bz2 android_bionic-290c0cb5044b643e5d6cbcb1a5b275541ca3a89e.zip |
Snap for 5716396 from 5cda74e065761bbeccf7ff61d7a3131bdf6490d0 to qt-release
Change-Id: I330f95e46b252c10acb047f929a3e85cbdb7f32c
-rw-r--r-- | libc/bionic/jemalloc_wrapper.cpp | 5 |
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); |