diff options
author | Christopher Ferris <cferris@google.com> | 2019-07-09 11:38:34 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-09 11:38:34 -0700 |
commit | 358c8c95725380eafe9f2aed0a4e2542592e85ff (patch) | |
tree | 8d5b09118c1f98d50d1a0cd4329f4ceb922f9513 | |
parent | d13cb58b3afda031fbe38f6dc8eaca28237c8a3b (diff) | |
parent | 5cda74e065761bbeccf7ff61d7a3131bdf6490d0 (diff) | |
download | bionic-358c8c95725380eafe9f2aed0a4e2542592e85ff.tar.gz |
Do not check tcache clear when doing a purge.android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-release
am: 5cda74e065
Change-Id: I6fdf747408e96c1f99c4544e94a97835c8588d19
-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); |