Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
32f99c51
Commit
32f99c51
authored
Apr 27, 2011
by
Pieter Noordhuis
Browse files
Show memory allocator in INFO output
parent
edf23aff
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/config.h
View file @
32f99c51
...
...
@@ -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
...
...
src/redis.c
View file @
32f99c51
...
...
@@ -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_tcm
alloc:%
d
\r\n
"
,
"
mem_
alloc
ator
:%
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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment