aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-04-22 07:12:38 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-04-22 07:12:38 +0000
commit1b0aff20627769f9070eda0f89982c4003235a7d (patch)
tree5025083404a8e7c2f24d9a444840303d62c4a604
parent91f65f46593dd87b272773bba1f6cc5fe1fbf8c4 (diff)
parent21acbb987d6d6a7e455c49afaf69b06295a7c709 (diff)
downloadplatform_external_jemalloc_new-android11-mainline-release.tar.gz
platform_external_jemalloc_new-android11-mainline-release.tar.bz2
platform_external_jemalloc_new-android11-mainline-release.zip
Snap for 6417465 from 21acbb987d6d6a7e455c49afaf69b06295a7c709 to mainline-releaseandroid-mainline-11.0.0_r1android11-mainline-release
Change-Id: I9edb78646d0527b41f8ecb8163392650c5a28ded
-rw-r--r--include/jemalloc/internal/jemalloc_internal_defs.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/jemalloc/internal/jemalloc_internal_defs.h b/include/jemalloc/internal/jemalloc_internal_defs.h
index 052bd11c..37ab466f 100644
--- a/include/jemalloc/internal/jemalloc_internal_defs.h
+++ b/include/jemalloc/internal/jemalloc_internal_defs.h
@@ -237,7 +237,12 @@
* common sequences of mmap()/munmap() calls will cause virtual memory map
* holes.
*/
+#if defined(__LP64__)
+// Only use retain for 64 bit since virtual memory can be exhausted
+// very easily when running in 32 bit.
+// See b/142556796.
#define JEMALLOC_RETAIN
+#endif
/* TLS is used to map arenas and magazine caches to threads. */
/* #undef JEMALLOC_TLS */