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

INFO: new memory reporting fields added.

Browse Source
This commit is contained in:
antirez 2016-09-15 10:33:23 +02:00
parent bf2624ea99
commit 7229af3898
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/server.c
View File

@ -2812,6 +2812,7 @@ sds genRedisInfoString(char *section) {
size_t total_system_mem = server.system_memory_size; size_t total_system_mem = server.system_memory_size;
const char *evict_policy = evictPolicyToString(); const char *evict_policy = evictPolicyToString();
long long memory_lua = (long long)lua_gc(server.lua,LUA_GCCOUNT,0)*1024; long long memory_lua = (long long)lua_gc(server.lua,LUA_GCCOUNT,0)*1024;
struct redisMemOverhead *mh = getMemoryOverheadData();
/* Peak memory is updated from time to time by serverCron() so it /* Peak memory is updated from time to time by serverCron() so it
* may happen that the instantaneous value is slightly bigger than * may happen that the instantaneous value is slightly bigger than
@ -2827,6 +2828,10 @@ sds genRedisInfoString(char *section) {
bytesToHuman(used_memory_rss_hmem,server.resident_set_size); bytesToHuman(used_memory_rss_hmem,server.resident_set_size);
bytesToHuman(maxmemory_hmem,server.maxmemory); bytesToHuman(maxmemory_hmem,server.maxmemory);
size_t net_usage = 1;
if (zmalloc_used > mh->startup_allocated)
net_usage = zmalloc_used - mh->startup_allocated;
if (sections++) info = sdscat(info,"\r\n"); if (sections++) info = sdscat(info,"\r\n");
info = sdscatprintf(info, info = sdscatprintf(info,
"# Memory\r\n" "# Memory\r\n"
@ -2836,6 +2841,10 @@ sds genRedisInfoString(char *section) {
"used_memory_rss_human:%s\r\n" "used_memory_rss_human:%s\r\n"
"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"
"used_memory_overhead:%zu\r\n"
"used_memory_startup:%zu\r\n"
"used_memory_dataset:%zu\r\n"
"used_memory_dataset_perc:%.2f%%\r\n"
"total_system_memory:%lu\r\n" "total_system_memory:%lu\r\n"
"total_system_memory_human:%s\r\n" "total_system_memory_human:%s\r\n"
"used_memory_lua:%lld\r\n" "used_memory_lua:%lld\r\n"
@ -2852,6 +2861,10 @@ sds genRedisInfoString(char *section) {
used_memory_rss_hmem, used_memory_rss_hmem,
server.stat_peak_memory, server.stat_peak_memory,
peak_hmem, peak_hmem,
mh->overhead_total,
mh->startup_allocated,
mh->dataset,
(float)mh->dataset*100/net_usage,
(unsigned long)total_system_mem, (unsigned long)total_system_mem,
total_system_hmem, total_system_hmem,
memory_lua, memory_lua,
@ -2862,7 +2875,8 @@ sds genRedisInfoString(char *section) {
zmalloc_get_fragmentation_ratio(server.resident_set_size), zmalloc_get_fragmentation_ratio(server.resident_set_size),
ZMALLOC_LIB, ZMALLOC_LIB,
lazyfreeGetPendingObjectsCount() lazyfreeGetPendingObjectsCount()
); );
freeMemoryOverheadData(mh);
} }
/* Persistence */ /* Persistence */