Show memory allocator in INFO output

diff --git a/src/config.h b/src/config.h
index 7e1133ec985937c4e60c09c5331b47b539d22073..208c7b93d2d3a901ea47980c2c32d6a072a6969e 100644 (file)
--- 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 <google/tcmalloc.h>
 #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 <jemalloc/jemalloc.h>
 #if JEMALLOC_VERSION_MAJOR >= 2 && JEMALLOC_VERSION_MINOR >= 1
@@ -28,7 +30,11 @@
 #define redis_malloc_size(p) malloc_size(p)
 #endif
 
-/* Tefine redis_fstat to fstat or fstat64() */
+#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
 #define redis_stat stat64

diff --git a/src/redis.c b/src/redis.c
index 5ddbb177cf6d284c2bceead0f7894f8b11034e3d..63b41ba841a0467f2057f3845e84880efdffeb2b 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -1319,18 +1319,14 @@ sds genRedisInfoString(char *section) {
             "used_memory_peak:%zu\r\n"
             "used_memory_peak_human:%s\r\n"
             "mem_fragmentation_ratio:%.2f\r\n"
-            "use_tcmalloc:%d\r\n",
+            "mem_allocator:%s\r\n",
             zmalloc_used_memory(),
             hmem,
             zmalloc_get_rss(),
             server.stat_peak_memory,
             peak_hmem,
             zmalloc_get_fragmentation_ratio(),
-    #ifdef USE_TCMALLOC
-            1
-    #else
-            0
-    #endif
+            REDIS_MALLOC
             );
     }