diff options
| author | Christopher Ferris <cferris@google.com> | 2014-05-08 11:14:03 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-05-20 14:47:33 -0700 |
| commit | 72bbd423579bb971dc06cdd3c06201faf3fe95e6 (patch) | |
| tree | 222c460d45ac120ae45940628c501d6cfb50f84b /libc/bionic/sysconf.cpp | |
| parent | afb89c2a01089bb247456634a15a58f111bb55a6 (diff) | |
| download | bionic-72bbd423579bb971dc06cdd3c06201faf3fe95e6.zip bionic-72bbd423579bb971dc06cdd3c06201faf3fe95e6.tar.gz bionic-72bbd423579bb971dc06cdd3c06201faf3fe95e6.tar.bz2 | |
Support for jemalloc to replace dlmalloc.
To use jemalloc, add MALLOC_IMPL = jemalloc in a board config file
and you get the new version automatically.
Update the pthread_create_key tests since jemalloc uses a few keys.
Add a new test to verify memalign works as expected.
Bug: 981363
Change-Id: I16eb152b291a95bd2499e90492fc6b4bd7053836
Diffstat (limited to 'libc/bionic/sysconf.cpp')
| -rw-r--r-- | libc/bionic/sysconf.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/bionic/sysconf.cpp b/libc/bionic/sysconf.cpp index 46874cc..8309f08 100644 --- a/libc/bionic/sysconf.cpp +++ b/libc/bionic/sysconf.cpp @@ -309,7 +309,7 @@ int sysconf(int name) { return _POSIX_THREAD_DESTRUCTOR_ITERATIONS; case _SC_THREAD_KEYS_MAX: - return (BIONIC_TLS_SLOTS - TLS_SLOT_FIRST_USER_SLOT - GLOBAL_INIT_THREAD_LOCAL_BUFFER_COUNT); + return (BIONIC_TLS_SLOTS - TLS_SLOT_FIRST_USER_SLOT - BIONIC_TLS_RESERVED_SLOTS); case _SC_THREAD_STACK_MIN: return PTHREAD_STACK_MIN; case _SC_THREAD_THREADS_MAX: return SYSTEM_THREAD_THREADS_MAX; |