summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Stancliff <matt@genges.com>2015-01-09 17:01:05 -0500
committerMatt Stancliff <matt@genges.com>2015-01-09 17:18:37 -0500
commit5a685f35a9e09cba3b08640912aed93acbc63351 (patch)
tree847e5961ef1162ec5690fcab9a7ef8eaa00d281d
parent6741bb981c53eb6b168e6ff96d915a0d51e0c7cd (diff)
downloadredis-5a685f35a9e09cba3b08640912aed93acbc63351.tar.gz
Add maxmemory limit to INFO MEMORY
Since we have the eviction policy, we should have the memory limit too.
-rw-r--r--src/redis.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/redis.c b/src/redis.c
index 0e02f85d7..56eb10aac 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -2702,6 +2702,7 @@ sds genRedisInfoString(char *section) {
char total_system_hmem[64];
char used_memory_lua_hmem[64];
char used_memory_rss_hmem[64];
+ char maxmemory_hmem[64];
size_t zmalloc_used = zmalloc_used_memory();
size_t total_system_mem = server.system_memory_size;
char *evict_policy = maxmemoryToString();
@@ -2719,6 +2720,7 @@ sds genRedisInfoString(char *section) {
bytesToHuman(total_system_hmem,total_system_mem);
bytesToHuman(used_memory_lua_hmem,memory_lua);
bytesToHuman(used_memory_rss_hmem,server.resident_set_size);
+ bytesToHuman(maxmemory_hmem,server.maxmemory);
if (sections++) info = sdscat(info,"\r\n");
info = sdscatprintf(info,
@@ -2733,9 +2735,11 @@ sds genRedisInfoString(char *section) {
"total_system_memory_human:%s\r\n"
"used_memory_lua:%lld\r\n"
"used_memory_lua_human:%s\r\n"
+ "maxmemory:%lld\r\n"
+ "maxmemory_human:%s\r\n"
+ "maxmemory_policy:%s\r\n"
"mem_fragmentation_ratio:%.2f\r\n"
- "mem_allocator:%s\r\n"
- "maxmemory_policy:%s\r\n",
+ "mem_allocator:%s\r\n",
zmalloc_used,
hmem,
server.resident_set_size,
@@ -2746,9 +2750,11 @@ sds genRedisInfoString(char *section) {
total_system_hmem,
memory_lua,
used_memory_lua_hmem,
+ server.maxmemory,
+ maxmemory_hmem,
+ evict_policy,
zmalloc_get_fragmentation_ratio(server.resident_set_size),
- ZMALLOC_LIB,
- evict_policy
+ ZMALLOC_LIB
);
}