fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-30 22:31:03 +00:00
Code Issues Projects Releases Wiki Activity

Show memory allocator in INFO output

Browse Source
This commit is contained in:
Pieter Noordhuis 2011-04-27 13:35:49 +02:00
parent edf23aff0e
commit 32f99c5128
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/config.h
View File

@ -10,12 +10,14 @@
* this expects a different allocation scheme. Therefore, *exclusively* use * this expects a different allocation scheme. Therefore, *exclusively* use
* either tcmalloc or OSX's malloc_size()! */ * either tcmalloc or OSX's malloc_size()! */
#if defined(USE_TCMALLOC) #if defined(USE_TCMALLOC)
#define REDIS_MALLOC "tcmalloc"
#include <google/tcmalloc.h> #include <google/tcmalloc.h>
#if TC_VERSION_MAJOR >= 1 && TC_VERSION_MINOR >= 6 #if TC_VERSION_MAJOR >= 1 && TC_VERSION_MINOR >= 6
#define HAVE_MALLOC_SIZE 1 #define HAVE_MALLOC_SIZE 1
#define redis_malloc_size(p) tc_malloc_size(p) #define redis_malloc_size(p) tc_malloc_size(p)
#endif #endif
#elif defined(USE_JEMALLOC) #elif defined(USE_JEMALLOC)
#define REDIS_MALLOC "jemalloc"
#define JEMALLOC_MANGLE #define JEMALLOC_MANGLE
#include <jemalloc/jemalloc.h> #include <jemalloc/jemalloc.h>
#if JEMALLOC_VERSION_MAJOR >= 2 && JEMALLOC_VERSION_MINOR >= 1 #if JEMALLOC_VERSION_MAJOR >= 2 && JEMALLOC_VERSION_MINOR >= 1
@ -28,7 +30,11 @@
#define redis_malloc_size(p) malloc_size(p) #define redis_malloc_size(p) malloc_size(p)
#endif #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) #if defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
#define redis_fstat fstat64 #define redis_fstat fstat64
#define redis_stat stat64 #define redis_stat stat64

8
src/redis.c
View File

@ -1319,18 +1319,14 @@ sds genRedisInfoString(char *section) {
"used_memory_peak:%zu\r\n" "used_memory_peak:%zu\r\n"
"used_memory_peak_human:%s\r\n" "used_memory_peak_human:%s\r\n"
"mem_fragmentation_ratio:%.2f\r\n" "mem_fragmentation_ratio:%.2f\r\n"
"use_tcmalloc:%d\r\n", "mem_allocator:%s\r\n",
zmalloc_used_memory(), zmalloc_used_memory(),
hmem, hmem,
zmalloc_get_rss(), zmalloc_get_rss(),
server.stat_peak_memory, server.stat_peak_memory,
peak_hmem, peak_hmem,
zmalloc_get_fragmentation_ratio(), zmalloc_get_fragmentation_ratio(),
#ifdef USE_TCMALLOC REDIS_MALLOC
1
#else
0
#endif
); );
} }