mirror of
https://github.com/fluencelabs/redis
synced 2025-03-17 16:10:50 +00:00
Show memory allocator in INFO output
This commit is contained in:
parent
edf23aff0e
commit
32f99c5128
@ -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
|
||||
|
@ -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
|
||||
);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user