diff --git a/src/config.h b/src/config.h index a9014ab6..fbb6259e 100644 --- a/src/config.h +++ b/src/config.h @@ -10,12 +10,14 @@ * this expects a different allocation scheme. Therefore, *exclusively* use * either tcmalloc or OSX's malloc_size()! */ #if defined(USE_TCMALLOC) +#define REDIS_MALLOC "tcmalloc" #include #if TC_VERSION_MAJOR >= 1 && TC_VERSION_MINOR >= 6 #define HAVE_MALLOC_SIZE 1 #define redis_malloc_size(p) tc_malloc_size(p) #endif #elif defined(USE_JEMALLOC) +#define REDIS_MALLOC "jemalloc" #define JEMALLOC_MANGLE #include #if JEMALLOC_VERSION_MAJOR >= 2 && JEMALLOC_VERSION_MINOR >= 1 @@ -28,6 +30,10 @@ #define redis_malloc_size(p) malloc_size(p) #endif +#ifndef REDIS_MALLOC +#define REDIS_MALLOC "libc" +#endif + /* define redis_fstat to fstat or fstat64() */ #if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6) #define redis_fstat fstat64 diff --git a/src/redis.c b/src/redis.c index 94bd1688..87d46e01 100644 --- a/src/redis.c +++ b/src/redis.c @@ -1180,7 +1180,7 @@ sds genRedisInfoString(void) { "used_memory_human:%s\r\n" "used_memory_rss:%zu\r\n" "mem_fragmentation_ratio:%.2f\r\n" - "use_tcmalloc:%d\r\n" + "mem_allocator:%s\r\n" "loading:%d\r\n" "aof_enabled:%d\r\n" "changes_since_last_save:%lld\r\n" @@ -1220,11 +1220,7 @@ sds genRedisInfoString(void) { hmem, zmalloc_get_rss(), zmalloc_get_fragmentation_ratio(), -#ifdef USE_TCMALLOC - 1, -#else - 0, -#endif + REDIS_MALLOC, server.loading, server.appendonly, server.dirty,