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
a244985d
Commit
a244985d
authored
Apr 27, 2011
by
Pieter Noordhuis
Browse files
Show memory allocator in INFO output
parent
b83a52c6
Changes
2
Show whitespace changes
Inline
Side-by-side
src/config.h
View file @
a244985d
...
@@ -10,12 +10,14 @@
...
@@ -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,6 +30,10 @@
...
@@ -28,6 +30,10 @@
#define redis_malloc_size(p) malloc_size(p)
#define redis_malloc_size(p) malloc_size(p)
#endif
#endif
#ifndef REDIS_MALLOC
#define REDIS_MALLOC "libc"
#endif
/* define redis_fstat to fstat or fstat64() */
/* 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
...
...
src/redis.c
View file @
a244985d
...
@@ -1180,7 +1180,7 @@ sds genRedisInfoString(void) {
...
@@ -1180,7 +1180,7 @@ sds genRedisInfoString(void) {
"used_memory_human:%s
\r\n
"
"used_memory_human:%s
\r\n
"
"used_memory_rss:%zu
\r\n
"
"used_memory_rss:%zu
\r\n
"
"mem_fragmentation_ratio:%.2f
\r\n
"
"mem_fragmentation_ratio:%.2f
\r\n
"
"
use_tcm
alloc:%
d
\r\n
"
"
mem_
alloc
ator
:%
s
\r\n
"
"loading:%d
\r\n
"
"loading:%d
\r\n
"
"aof_enabled:%d
\r\n
"
"aof_enabled:%d
\r\n
"
"changes_since_last_save:%lld
\r\n
"
"changes_since_last_save:%lld
\r\n
"
...
@@ -1220,11 +1220,7 @@ sds genRedisInfoString(void) {
...
@@ -1220,11 +1220,7 @@ sds genRedisInfoString(void) {
hmem
,
hmem
,
zmalloc_get_rss
(),
zmalloc_get_rss
(),
zmalloc_get_fragmentation_ratio
(),
zmalloc_get_fragmentation_ratio
(),
#ifdef USE_TCMALLOC
REDIS_MALLOC
,
1
,
#else
0
,
#endif
server
.
loading
,
server
.
loading
,
server
.
appendonly
,
server
.
appendonly
,
server
.
dirty
,
server
.
dirty
,
...
...
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