X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/0d808ef27532204d4176c16956eb4cef7f452ae2..554a5dd2fc708d0985fecf69b87e167707691c32:/src/redis.c diff --git a/src/redis.c b/src/redis.c index f299dcab..5548d1cf 100644 --- a/src/redis.c +++ b/src/redis.c @@ -68,7 +68,7 @@ double R_Zero, R_PosInf, R_NegInf, R_Nan; /* Global vars */ struct redisServer server; /* server global state */ struct redisCommand *commandTable; -struct redisCommand readonlyCommandTable[] = { +struct redisCommand redisCommandTable[] = { {"get",getCommand,2,0,NULL,1,1,1,0,0}, {"set",setCommand,3,REDIS_CMD_DENYOOM,NULL,0,0,0,0,0}, {"setnx",setnxCommand,3,REDIS_CMD_DENYOOM,NULL,0,0,0,0,0}, @@ -936,10 +936,10 @@ void initServer() { * we have on top of redis.c file. */ void populateCommandTable(void) { int j; - int numcommands = sizeof(readonlyCommandTable)/sizeof(struct redisCommand); + int numcommands = sizeof(redisCommandTable)/sizeof(struct redisCommand); for (j = 0; j < numcommands; j++) { - struct redisCommand *c = readonlyCommandTable+j; + struct redisCommand *c = redisCommandTable+j; int retval; retval = dictAdd(server.commands, sdsnew(c->name), c); @@ -947,6 +947,18 @@ void populateCommandTable(void) { } } +void resetCommandTableStats(void) { + int numcommands = sizeof(redisCommandTable)/sizeof(struct redisCommand); + int j; + + for (j = 0; j < numcommands; j++) { + struct redisCommand *c = redisCommandTable+j; + + c->microseconds = 0; + c->calls = 0; + } +} + /* ====================== Commands lookup and execution ===================== */ struct redisCommand *lookupCommand(sds name) { @@ -1405,13 +1417,15 @@ sds genRedisInfoString(char *section) { if (allsections || !strcasecmp(section,"commandstats")) { if (sections++) info = sdscat(info,"\r\n"); info = sdscatprintf(info, "# Commandstats\r\n"); - numcommands = sizeof(readonlyCommandTable)/sizeof(struct redisCommand); + numcommands = sizeof(redisCommandTable)/sizeof(struct redisCommand); for (j = 0; j < numcommands; j++) { - struct redisCommand *c = readonlyCommandTable+j; + struct redisCommand *c = redisCommandTable+j; - if (!c->microseconds) continue; - info = sdscatprintf(info,"cmdstat_%s:calls=%lld,usec=%lld\r\n", - c->name, c->calls, c->microseconds); + if (!c->calls) continue; + info = sdscatprintf(info, + "cmdstat_%s:calls=%lld,usec=%lld,usec_per_call=%.2f\r\n", + c->name, c->calls, c->microseconds, + (c->calls == 0) ? 0 : ((float)c->microseconds/c->calls)); } } @@ -1550,6 +1564,7 @@ void freeMemoryIfNeeded(void) { /* Finally remove the selected key. */ if (bestkey) { robj *keyobj = createStringObject(bestkey,sdslen(bestkey)); + propagateExpire(db,keyobj); dbDelete(db,keyobj); server.stat_evictedkeys++; decrRefCount(keyobj);