Commit 13b37159 authored by antirez's avatar antirez
Browse files

reports if tcmalloc is in used in INFO output

parent 0a802bd7
...@@ -15,6 +15,7 @@ endif ...@@ -15,6 +15,7 @@ endif
ifeq ($(USE_TCMALLOC),yes) ifeq ($(USE_TCMALLOC),yes)
CCLINK+= -ltcmalloc CCLINK+= -ltcmalloc
CCFLAGS+= -DUSE_TCMALLOC
endif endif
CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF) CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
DEBUG?= -g -rdynamic -ggdb DEBUG?= -g -rdynamic -ggdb
......
...@@ -1185,6 +1185,7 @@ sds genRedisInfoString(void) { ...@@ -1185,6 +1185,7 @@ sds genRedisInfoString(void) {
"used_memory:%zu\r\n" "used_memory:%zu\r\n"
"used_memory_human:%s\r\n" "used_memory_human:%s\r\n"
"mem_fragmentation_ratio:%.2f\r\n" "mem_fragmentation_ratio:%.2f\r\n"
"use_tcmalloc:%d\r\n"
"changes_since_last_save:%lld\r\n" "changes_since_last_save:%lld\r\n"
"bgsave_in_progress:%d\r\n" "bgsave_in_progress:%d\r\n"
"last_save_time:%ld\r\n" "last_save_time:%ld\r\n"
...@@ -1219,6 +1220,11 @@ sds genRedisInfoString(void) { ...@@ -1219,6 +1220,11 @@ sds genRedisInfoString(void) {
zmalloc_used_memory(), zmalloc_used_memory(),
hmem, hmem,
zmalloc_get_fragmentation_ratio(), zmalloc_get_fragmentation_ratio(),
#ifdef USE_TCMALLOC
1,
#else
0,
#endif
server.dirty, server.dirty,
server.bgsavechildpid != -1, server.bgsavechildpid != -1,
server.lastsave, server.lastsave,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment