caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve consistency of INFO MEMORY fields

Browse Source 
Adds used_memory_rss_human and used_memory_lua_human to match
all the other fields reporting human-readable memory too.
This commit is contained in:
Matt Stancliff 2015-01-09 17:00:43 -05:00
parent 0d22121c27
commit 6741bb981c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/redis.c
View File

@ -2700,9 +2700,12 @@ sds genRedisInfoString(char *section) {
char hmem[64]; char hmem[64];
char peak_hmem[64]; char peak_hmem[64];
char total_system_hmem[64]; char total_system_hmem[64];
char used_memory_lua_hmem[64];
char used_memory_rss_hmem[64];
size_t zmalloc_used = zmalloc_used_memory(); size_t zmalloc_used = zmalloc_used_memory();
size_t total_system_mem = server.system_memory_size; size_t total_system_mem = server.system_memory_size;
char *evict_policy = maxmemoryToString(); char *evict_policy = maxmemoryToString();
long long memory_lua = (long long)lua_gc(server.lua,LUA_GCCOUNT,0)*1024;
/* 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
@ -2714,6 +2717,8 @@ sds genRedisInfoString(char *section) {
bytesToHuman(hmem,zmalloc_used); bytesToHuman(hmem,zmalloc_used);
bytesToHuman(peak_hmem,server.stat_peak_memory); bytesToHuman(peak_hmem,server.stat_peak_memory);
bytesToHuman(total_system_hmem,total_system_mem); bytesToHuman(total_system_hmem,total_system_mem);
bytesToHuman(used_memory_lua_hmem,memory_lua);
bytesToHuman(used_memory_rss_hmem,server.resident_set_size);
if (sections++) info = sdscat(info,"\r\n"); if (sections++) info = sdscat(info,"\r\n");
info = sdscatprintf(info, info = sdscatprintf(info,
@ -2721,22 +2726,26 @@ sds genRedisInfoString(char *section) {
"used_memory:%zu\r\n" "used_memory:%zu\r\n"
"used_memory_human:%s\r\n" "used_memory_human:%s\r\n"
"used_memory_rss:%zu\r\n" "used_memory_rss:%zu\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"
"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"
"used_memory_lua_human:%s\r\n"
"mem_fragmentation_ratio:%.2f\r\n" "mem_fragmentation_ratio:%.2f\r\n"
"mem_allocator:%s\r\n" "mem_allocator:%s\r\n"
"maxmemory_policy:%s\r\n", "maxmemory_policy:%s\r\n",
zmalloc_used, zmalloc_used,
hmem, hmem,
server.resident_set_size, server.resident_set_size,
used_memory_rss_hmem,
server.stat_peak_memory, server.stat_peak_memory,
peak_hmem, peak_hmem,
(unsigned long)total_system_mem, (unsigned long)total_system_mem,
total_system_hmem, total_system_hmem,
((long long)lua_gc(server.lua,LUA_GCCOUNT,0))*1024LL, memory_lua,
used_memory_lua_hmem,
zmalloc_get_fragmentation_ratio(server.resident_set_size), zmalloc_get_fragmentation_ratio(server.resident_set_size),
ZMALLOC_LIB, ZMALLOC_LIB,
evict_policy evict_policy