diff --git a/src/Makefile b/src/Makefile index dd18b2c7..e99a18a5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,6 +15,7 @@ endif ifeq ($(USE_TCMALLOC),yes) CCLINK+= -ltcmalloc + CCFLAGS+= -DUSE_TCMALLOC endif CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF) DEBUG?= -g -rdynamic -ggdb diff --git a/src/redis.c b/src/redis.c index f3cf100e..7749cb90 100644 --- a/src/redis.c +++ b/src/redis.c @@ -1185,6 +1185,7 @@ sds genRedisInfoString(void) { "used_memory:%zu\r\n" "used_memory_human:%s\r\n" "mem_fragmentation_ratio:%.2f\r\n" + "use_tcmalloc:%d\r\n" "changes_since_last_save:%lld\r\n" "bgsave_in_progress:%d\r\n" "last_save_time:%ld\r\n" @@ -1219,6 +1220,11 @@ sds genRedisInfoString(void) { zmalloc_used_memory(), hmem, zmalloc_get_fragmentation_ratio(), +#ifdef USE_TCMALLOC + 1, +#else + 0, +#endif server.dirty, server.bgsavechildpid != -1, server.lastsave,