caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add maxmemory_policy to INFO output

Browse Source 
Also refactors getting human string values from
the defined value in `server.maxmemory_policy`
into a common function.
This commit is contained in:
Matt Stancliff 2014-06-17 10:42:19 -04:00
parent 3cd36a4dd9
commit 7d4c2a98b6
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/config.c
View File

@ -1004,6 +1004,20 @@ badfmt: /* Bad format errors */
} \ } \
} while(0); } while(0);
char *maxmemoryToString() {
char *s;
switch(server.maxmemory_policy) {
case REDIS_MAXMEMORY_VOLATILE_LRU: s = "volatile-lru"; break;
case REDIS_MAXMEMORY_VOLATILE_TTL: s = "volatile-ttl"; break;
case REDIS_MAXMEMORY_VOLATILE_RANDOM: s = "volatile-random"; break;
case REDIS_MAXMEMORY_ALLKEYS_LRU: s = "allkeys-lru"; break;
case REDIS_MAXMEMORY_ALLKEYS_RANDOM: s = "allkeys-random"; break;
case REDIS_MAXMEMORY_NO_EVICTION: s = "noeviction"; break;
default: s = "unknown"; break;
}
return s;
}
void configGetCommand(redisClient *c) { void configGetCommand(redisClient *c) {
robj *o = c->argv[2]; robj *o = c->argv[2];
void *replylen = addDeferredMultiBulkLength(c); void *replylen = addDeferredMultiBulkLength(c);
@ -1112,19 +1126,8 @@ void configGetCommand(redisClient *c) {
matches++; matches++;
} }
if (stringmatch(pattern,"maxmemory-policy",0)) { if (stringmatch(pattern,"maxmemory-policy",0)) {
char *s;
switch(server.maxmemory_policy) {
case REDIS_MAXMEMORY_VOLATILE_LRU: s = "volatile-lru"; break;
case REDIS_MAXMEMORY_VOLATILE_TTL: s = "volatile-ttl"; break;
case REDIS_MAXMEMORY_VOLATILE_RANDOM: s = "volatile-random"; break;
case REDIS_MAXMEMORY_ALLKEYS_LRU: s = "allkeys-lru"; break;
case REDIS_MAXMEMORY_ALLKEYS_RANDOM: s = "allkeys-random"; break;
case REDIS_MAXMEMORY_NO_EVICTION: s = "noeviction"; break;
default: s = "unknown"; break; /* too harmless to panic */
}
addReplyBulkCString(c,"maxmemory-policy"); addReplyBulkCString(c,"maxmemory-policy");
addReplyBulkCString(c,s); addReplyBulkCString(c,maxmemoryToString());
matches++; matches++;
} }
if (stringmatch(pattern,"appendfsync",0)) { if (stringmatch(pattern,"appendfsync",0)) {

7
src/redis.c
View File

@ -2699,6 +2699,7 @@ sds genRedisInfoString(char *section) {
char hmem[64]; char hmem[64];
char peak_hmem[64]; char peak_hmem[64];
size_t zmalloc_used = zmalloc_used_memory(); size_t zmalloc_used = zmalloc_used_memory();
char *evict_policy = maxmemoryToString();
/* 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
@ -2719,7 +2720,8 @@ sds genRedisInfoString(char *section) {
"used_memory_peak_human:%s\r\n" "used_memory_peak_human:%s\r\n"
"used_memory_lua:%lld\r\n" "used_memory_lua:%lld\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",
zmalloc_used, zmalloc_used,
hmem, hmem,
server.resident_set_size, server.resident_set_size,
@ -2727,7 +2729,8 @@ sds genRedisInfoString(char *section) {
peak_hmem, peak_hmem,
((long long)lua_gc(server.lua,LUA_GCCOUNT,0))*1024LL, ((long long)lua_gc(server.lua,LUA_GCCOUNT,0))*1024LL,
zmalloc_get_fragmentation_ratio(server.resident_set_size), zmalloc_get_fragmentation_ratio(server.resident_set_size),
ZMALLOC_LIB ZMALLOC_LIB,
evict_policy
); );
} }

1
src/redis.h
View File

@ -1255,6 +1255,7 @@ void closeListeningSockets(int unlink_unix_socket);
void updateCachedTime(void); void updateCachedTime(void);
void resetServerStats(void); void resetServerStats(void);
unsigned int getLRUClock(void); unsigned int getLRUClock(void);
char *maxmemoryToString(void);
/* Set data type */ /* Set data type */
robj *setTypeCreate(robj *value); robj *setTypeCreate(robj *value);