Merge "Update the number of jemalloc reserved keys."

This commit is contained in:
Christopher Ferris 2015-04-16 04:42:36 +00:00 committed by Gerrit Code Review
commit 12d8902745

View File

@ -97,14 +97,8 @@ enum {
#define LIBC_PTHREAD_KEY_RESERVED_COUNT 12 #define LIBC_PTHREAD_KEY_RESERVED_COUNT 12
#if defined(USE_JEMALLOC) #if defined(USE_JEMALLOC)
/* Following are current pthread keys used internally by jemalloc: /* Internally, jemalloc uses a single key for per thread data. */
* je_thread_allocated_tsd jemalloc #define JEMALLOC_PTHREAD_KEY_RESERVED_COUNT 1
* je_arenas_tsd jemalloc
* je_tcache_tsd jemalloc
* je_tcache_enabled_tsd jemalloc
* je_quarantine_tsd jemalloc
*/
#define JEMALLOC_PTHREAD_KEY_RESERVED_COUNT 5
#define BIONIC_PTHREAD_KEY_RESERVED_COUNT (LIBC_PTHREAD_KEY_RESERVED_COUNT + JEMALLOC_PTHREAD_KEY_RESERVED_COUNT) #define BIONIC_PTHREAD_KEY_RESERVED_COUNT (LIBC_PTHREAD_KEY_RESERVED_COUNT + JEMALLOC_PTHREAD_KEY_RESERVED_COUNT)
#else #else
#define BIONIC_PTHREAD_KEY_RESERVED_COUNT LIBC_PTHREAD_KEY_RESERVED_COUNT #define BIONIC_PTHREAD_KEY_RESERVED_COUNT LIBC_PTHREAD_KEY_RESERVED_COUNT