From c0f89283cc746ff7d6f6be405c603435b8b02657 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Wed, 15 Apr 2015 16:34:57 -0700 Subject: [PATCH] Update the number of jemalloc reserved keys. jemalloc now uses a single key pointing to a structure rather than multiple keys. Change-Id: Ib76185a594ab2cd4dc400d9a7a5bc0a57a7ac92d --- libc/private/bionic_tls.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libc/private/bionic_tls.h b/libc/private/bionic_tls.h index 414d1711d..30dc0eb3e 100644 --- a/libc/private/bionic_tls.h +++ b/libc/private/bionic_tls.h @@ -97,14 +97,8 @@ enum { #define LIBC_PTHREAD_KEY_RESERVED_COUNT 12 #if defined(USE_JEMALLOC) -/* Following are current pthread keys used internally by jemalloc: - * je_thread_allocated_tsd jemalloc - * je_arenas_tsd jemalloc - * je_tcache_tsd jemalloc - * je_tcache_enabled_tsd jemalloc - * je_quarantine_tsd jemalloc - */ -#define JEMALLOC_PTHREAD_KEY_RESERVED_COUNT 5 +/* Internally, jemalloc uses a single key for per thread data. */ +#define JEMALLOC_PTHREAD_KEY_RESERVED_COUNT 1 #define BIONIC_PTHREAD_KEY_RESERVED_COUNT (LIBC_PTHREAD_KEY_RESERVED_COUNT + JEMALLOC_PTHREAD_KEY_RESERVED_COUNT) #else #define BIONIC_PTHREAD_KEY_RESERVED_COUNT LIBC_PTHREAD_KEY_RESERVED_COUNT