/* Global vars */
struct redisServer server; /* server global state */
struct redisCommand *commandTable;
-struct redisCommand readonlyCommandTable[] = {
- {"get",getCommand,2,0,NULL,1,1,1},
- {"set",setCommand,3,REDIS_CMD_DENYOOM,NULL,0,0,0},
- {"setnx",setnxCommand,3,REDIS_CMD_DENYOOM,NULL,0,0,0},
- {"setex",setexCommand,4,REDIS_CMD_DENYOOM,NULL,0,0,0},
- {"append",appendCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"strlen",strlenCommand,2,0,NULL,1,1,1},
- {"del",delCommand,-2,0,NULL,0,0,0},
- {"exists",existsCommand,2,0,NULL,1,1,1},
- {"setbit",setbitCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"getbit",getbitCommand,3,0,NULL,1,1,1},
- {"setrange",setrangeCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"getrange",getrangeCommand,4,0,NULL,1,1,1},
- {"substr",getrangeCommand,4,0,NULL,1,1,1},
- {"incr",incrCommand,2,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"decr",decrCommand,2,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"mget",mgetCommand,-2,0,NULL,1,-1,1},
- {"rpush",rpushCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"lpush",lpushCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"rpushx",rpushxCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"lpushx",lpushxCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"linsert",linsertCommand,5,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"rpop",rpopCommand,2,0,NULL,1,1,1},
- {"lpop",lpopCommand,2,0,NULL,1,1,1},
- {"brpop",brpopCommand,-3,0,NULL,1,1,1},
- {"brpoplpush",brpoplpushCommand,4,REDIS_CMD_DENYOOM,NULL,1,2,1},
- {"blpop",blpopCommand,-3,0,NULL,1,1,1},
- {"llen",llenCommand,2,0,NULL,1,1,1},
- {"lindex",lindexCommand,3,0,NULL,1,1,1},
- {"lset",lsetCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"lrange",lrangeCommand,4,0,NULL,1,1,1},
- {"ltrim",ltrimCommand,4,0,NULL,1,1,1},
- {"lrem",lremCommand,4,0,NULL,1,1,1},
- {"rpoplpush",rpoplpushCommand,3,REDIS_CMD_DENYOOM,NULL,1,2,1},
- {"sadd",saddCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"srem",sremCommand,3,0,NULL,1,1,1},
- {"smove",smoveCommand,4,0,NULL,1,2,1},
- {"sismember",sismemberCommand,3,0,NULL,1,1,1},
- {"scard",scardCommand,2,0,NULL,1,1,1},
- {"spop",spopCommand,2,0,NULL,1,1,1},
- {"srandmember",srandmemberCommand,2,0,NULL,1,1,1},
- {"sinter",sinterCommand,-2,REDIS_CMD_DENYOOM,NULL,1,-1,1},
- {"sinterstore",sinterstoreCommand,-3,REDIS_CMD_DENYOOM,NULL,2,-1,1},
- {"sunion",sunionCommand,-2,REDIS_CMD_DENYOOM,NULL,1,-1,1},
- {"sunionstore",sunionstoreCommand,-3,REDIS_CMD_DENYOOM,NULL,2,-1,1},
- {"sdiff",sdiffCommand,-2,REDIS_CMD_DENYOOM,NULL,1,-1,1},
- {"sdiffstore",sdiffstoreCommand,-3,REDIS_CMD_DENYOOM,NULL,2,-1,1},
- {"smembers",sinterCommand,2,0,NULL,1,1,1},
- {"zadd",zaddCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"zincrby",zincrbyCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"zrem",zremCommand,3,0,NULL,1,1,1},
- {"zremrangebyscore",zremrangebyscoreCommand,4,0,NULL,1,1,1},
- {"zremrangebyrank",zremrangebyrankCommand,4,0,NULL,1,1,1},
- {"zunionstore",zunionstoreCommand,-4,REDIS_CMD_DENYOOM,zunionInterBlockClientOnSwappedKeys,0,0,0},
- {"zinterstore",zinterstoreCommand,-4,REDIS_CMD_DENYOOM,zunionInterBlockClientOnSwappedKeys,0,0,0},
- {"zrange",zrangeCommand,-4,0,NULL,1,1,1},
- {"zrangebyscore",zrangebyscoreCommand,-4,0,NULL,1,1,1},
- {"zrevrangebyscore",zrevrangebyscoreCommand,-4,0,NULL,1,1,1},
- {"zcount",zcountCommand,4,0,NULL,1,1,1},
- {"zrevrange",zrevrangeCommand,-4,0,NULL,1,1,1},
- {"zcard",zcardCommand,2,0,NULL,1,1,1},
- {"zscore",zscoreCommand,3,0,NULL,1,1,1},
- {"zrank",zrankCommand,3,0,NULL,1,1,1},
- {"zrevrank",zrevrankCommand,3,0,NULL,1,1,1},
- {"hset",hsetCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"hsetnx",hsetnxCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"hget",hgetCommand,3,0,NULL,1,1,1},
- {"hmset",hmsetCommand,-4,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"hmget",hmgetCommand,-3,0,NULL,1,1,1},
- {"hincrby",hincrbyCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"hdel",hdelCommand,3,0,NULL,1,1,1},
- {"hlen",hlenCommand,2,0,NULL,1,1,1},
- {"hkeys",hkeysCommand,2,0,NULL,1,1,1},
- {"hvals",hvalsCommand,2,0,NULL,1,1,1},
- {"hgetall",hgetallCommand,2,0,NULL,1,1,1},
- {"hexists",hexistsCommand,3,0,NULL,1,1,1},
- {"incrby",incrbyCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"decrby",decrbyCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"getset",getsetCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"mset",msetCommand,-3,REDIS_CMD_DENYOOM,NULL,1,-1,2},
- {"msetnx",msetnxCommand,-3,REDIS_CMD_DENYOOM,NULL,1,-1,2},
- {"randomkey",randomkeyCommand,1,0,NULL,0,0,0},
- {"select",selectCommand,2,0,NULL,0,0,0},
- {"move",moveCommand,3,0,NULL,1,1,1},
- {"rename",renameCommand,3,0,NULL,1,1,1},
- {"renamenx",renamenxCommand,3,0,NULL,1,1,1},
- {"expire",expireCommand,3,0,NULL,0,0,0},
- {"expireat",expireatCommand,3,0,NULL,0,0,0},
- {"keys",keysCommand,2,0,NULL,0,0,0},
- {"dbsize",dbsizeCommand,1,0,NULL,0,0,0},
- {"auth",authCommand,2,0,NULL,0,0,0},
- {"ping",pingCommand,1,0,NULL,0,0,0},
- {"echo",echoCommand,2,0,NULL,0,0,0},
- {"save",saveCommand,1,0,NULL,0,0,0},
- {"bgsave",bgsaveCommand,1,0,NULL,0,0,0},
- {"bgrewriteaof",bgrewriteaofCommand,1,0,NULL,0,0,0},
- {"shutdown",shutdownCommand,1,0,NULL,0,0,0},
- {"lastsave",lastsaveCommand,1,0,NULL,0,0,0},
- {"type",typeCommand,2,0,NULL,1,1,1},
- {"multi",multiCommand,1,0,NULL,0,0,0},
- {"exec",execCommand,1,REDIS_CMD_DENYOOM,execBlockClientOnSwappedKeys,0,0,0},
- {"discard",discardCommand,1,0,NULL,0,0,0},
- {"sync",syncCommand,1,0,NULL,0,0,0},
- {"flushdb",flushdbCommand,1,0,NULL,0,0,0},
- {"flushall",flushallCommand,1,0,NULL,0,0,0},
- {"sort",sortCommand,-2,REDIS_CMD_DENYOOM,NULL,1,1,1},
- {"info",infoCommand,1,0,NULL,0,0,0},
- {"monitor",monitorCommand,1,0,NULL,0,0,0},
- {"ttl",ttlCommand,2,0,NULL,1,1,1},
- {"persist",persistCommand,2,0,NULL,1,1,1},
- {"slaveof",slaveofCommand,3,0,NULL,0,0,0},
- {"debug",debugCommand,-2,0,NULL,0,0,0},
- {"config",configCommand,-2,0,NULL,0,0,0},
- {"subscribe",subscribeCommand,-2,0,NULL,0,0,0},
- {"unsubscribe",unsubscribeCommand,-1,0,NULL,0,0,0},
- {"psubscribe",psubscribeCommand,-2,0,NULL,0,0,0},
- {"punsubscribe",punsubscribeCommand,-1,0,NULL,0,0,0},
- {"publish",publishCommand,3,REDIS_CMD_FORCE_REPLICATION,NULL,0,0,0},
- {"watch",watchCommand,-2,0,NULL,0,0,0},
- {"unwatch",unwatchCommand,1,0,NULL,0,0,0}
+struct redisCommand redisCommandTable[] = {
+ {"get",getCommand,2,0,NULL,1,1,1,0,0},
+ {"set",setCommand,3,REDIS_CMD_DENYOOM,noPreloadGetKeys,1,1,1,0,0},
+ {"setnx",setnxCommand,3,REDIS_CMD_DENYOOM,noPreloadGetKeys,1,1,1,0,0},
+ {"setex",setexCommand,4,REDIS_CMD_DENYOOM,noPreloadGetKeys,2,2,1,0,0},
+ {"append",appendCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"strlen",strlenCommand,2,0,NULL,1,1,1,0,0},
+ {"del",delCommand,-2,0,noPreloadGetKeys,1,-1,1,0,0},
+ {"exists",existsCommand,2,0,NULL,1,1,1,0,0},
+ {"setbit",setbitCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"getbit",getbitCommand,3,0,NULL,1,1,1,0,0},
+ {"setrange",setrangeCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"getrange",getrangeCommand,4,0,NULL,1,1,1,0,0},
+ {"substr",getrangeCommand,4,0,NULL,1,1,1,0,0},
+ {"incr",incrCommand,2,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"decr",decrCommand,2,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"mget",mgetCommand,-2,0,NULL,1,-1,1,0,0},
+ {"rpush",rpushCommand,-3,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"lpush",lpushCommand,-3,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"rpushx",rpushxCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"lpushx",lpushxCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"linsert",linsertCommand,5,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"rpop",rpopCommand,2,0,NULL,1,1,1,0,0},
+ {"lpop",lpopCommand,2,0,NULL,1,1,1,0,0},
+ {"brpop",brpopCommand,-3,0,NULL,1,1,1,0,0},
+ {"brpoplpush",brpoplpushCommand,4,REDIS_CMD_DENYOOM,NULL,1,2,1,0,0},
+ {"blpop",blpopCommand,-3,0,NULL,1,-2,1,0,0},
+ {"llen",llenCommand,2,0,NULL,1,1,1,0,0},
+ {"lindex",lindexCommand,3,0,NULL,1,1,1,0,0},
+ {"lset",lsetCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"lrange",lrangeCommand,4,0,NULL,1,1,1,0,0},
+ {"ltrim",ltrimCommand,4,0,NULL,1,1,1,0,0},
+ {"lrem",lremCommand,4,0,NULL,1,1,1,0,0},
+ {"rpoplpush",rpoplpushCommand,3,REDIS_CMD_DENYOOM,NULL,1,2,1,0,0},
+ {"sadd",saddCommand,-3,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"srem",sremCommand,-3,0,NULL,1,1,1,0,0},
+ {"smove",smoveCommand,4,0,NULL,1,2,1,0,0},
+ {"sismember",sismemberCommand,3,0,NULL,1,1,1,0,0},
+ {"scard",scardCommand,2,0,NULL,1,1,1,0,0},
+ {"spop",spopCommand,2,0,NULL,1,1,1,0,0},
+ {"srandmember",srandmemberCommand,2,0,NULL,1,1,1,0,0},
+ {"sinter",sinterCommand,-2,REDIS_CMD_DENYOOM,NULL,1,-1,1,0,0},
+ {"sinterstore",sinterstoreCommand,-3,REDIS_CMD_DENYOOM,NULL,2,-1,1,0,0},
+ {"sunion",sunionCommand,-2,REDIS_CMD_DENYOOM,NULL,1,-1,1,0,0},
+ {"sunionstore",sunionstoreCommand,-3,REDIS_CMD_DENYOOM,NULL,2,-1,1,0,0},
+ {"sdiff",sdiffCommand,-2,REDIS_CMD_DENYOOM,NULL,1,-1,1,0,0},
+ {"sdiffstore",sdiffstoreCommand,-3,REDIS_CMD_DENYOOM,NULL,2,-1,1,0,0},
+ {"smembers",sinterCommand,2,0,NULL,1,1,1,0,0},
+ {"zadd",zaddCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"zincrby",zincrbyCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"zrem",zremCommand,3,0,NULL,1,1,1,0,0},
+ {"zremrangebyscore",zremrangebyscoreCommand,4,0,NULL,1,1,1,0,0},
+ {"zremrangebyrank",zremrangebyrankCommand,4,0,NULL,1,1,1,0,0},
+ {"zunionstore",zunionstoreCommand,-4,REDIS_CMD_DENYOOM,zunionInterGetKeys,0,0,0,0,0},
+ {"zinterstore",zinterstoreCommand,-4,REDIS_CMD_DENYOOM,zunionInterGetKeys,0,0,0,0,0},
+ {"zrange",zrangeCommand,-4,0,NULL,1,1,1,0,0},
+ {"zrangebyscore",zrangebyscoreCommand,-4,0,NULL,1,1,1,0,0},
+ {"zrevrangebyscore",zrevrangebyscoreCommand,-4,0,NULL,1,1,1,0,0},
+ {"zcount",zcountCommand,4,0,NULL,1,1,1,0,0},
+ {"zrevrange",zrevrangeCommand,-4,0,NULL,1,1,1,0,0},
+ {"zcard",zcardCommand,2,0,NULL,1,1,1,0,0},
+ {"zscore",zscoreCommand,3,0,NULL,1,1,1,0,0},
+ {"zrank",zrankCommand,3,0,NULL,1,1,1,0,0},
+ {"zrevrank",zrevrankCommand,3,0,NULL,1,1,1,0,0},
+ {"hset",hsetCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"hsetnx",hsetnxCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"hget",hgetCommand,3,0,NULL,1,1,1,0,0},
+ {"hmset",hmsetCommand,-4,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"hmget",hmgetCommand,-3,0,NULL,1,1,1,0,0},
+ {"hincrby",hincrbyCommand,4,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"hdel",hdelCommand,-3,0,NULL,1,1,1,0,0},
+ {"hlen",hlenCommand,2,0,NULL,1,1,1,0,0},
+ {"hkeys",hkeysCommand,2,0,NULL,1,1,1,0,0},
+ {"hvals",hvalsCommand,2,0,NULL,1,1,1,0,0},
+ {"hgetall",hgetallCommand,2,0,NULL,1,1,1,0,0},
+ {"hexists",hexistsCommand,3,0,NULL,1,1,1,0,0},
+ {"incrby",incrbyCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"decrby",decrbyCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"getset",getsetCommand,3,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"mset",msetCommand,-3,REDIS_CMD_DENYOOM,NULL,1,-1,2,0,0},
+ {"msetnx",msetnxCommand,-3,REDIS_CMD_DENYOOM,NULL,1,-1,2,0,0},
+ {"randomkey",randomkeyCommand,1,0,NULL,0,0,0,0,0},
+ {"select",selectCommand,2,0,NULL,0,0,0,0,0},
+ {"move",moveCommand,3,0,NULL,1,1,1,0,0},
+ {"rename",renameCommand,3,0,renameGetKeys,1,2,1,0,0},
+ {"renamenx",renamenxCommand,3,0,renameGetKeys,1,2,1,0,0},
+ {"expire",expireCommand,3,0,NULL,1,1,1,0,0},
+ {"expireat",expireatCommand,3,0,NULL,1,1,1,0,0},
+ {"keys",keysCommand,2,0,NULL,0,0,0,0,0},
+ {"dbsize",dbsizeCommand,1,0,NULL,0,0,0,0,0},
+ {"auth",authCommand,2,0,NULL,0,0,0,0,0},
+ {"ping",pingCommand,1,0,NULL,0,0,0,0,0},
+ {"echo",echoCommand,2,0,NULL,0,0,0,0,0},
+ {"save",saveCommand,1,0,NULL,0,0,0,0,0},
+ {"bgsave",bgsaveCommand,1,0,NULL,0,0,0,0,0},
+ {"bgrewriteaof",bgrewriteaofCommand,1,0,NULL,0,0,0,0,0},
+ {"shutdown",shutdownCommand,1,0,NULL,0,0,0,0,0},
+ {"lastsave",lastsaveCommand,1,0,NULL,0,0,0,0,0},
+ {"type",typeCommand,2,0,NULL,1,1,1,0,0},
+ {"multi",multiCommand,1,0,NULL,0,0,0,0,0},
+ {"exec",execCommand,1,REDIS_CMD_DENYOOM,NULL,0,0,0,0,0},
+ {"discard",discardCommand,1,0,NULL,0,0,0,0,0},
+ {"sync",syncCommand,1,0,NULL,0,0,0,0,0},
+ {"flushdb",flushdbCommand,1,0,NULL,0,0,0,0,0},
+ {"flushall",flushallCommand,1,0,NULL,0,0,0,0,0},
+ {"sort",sortCommand,-2,REDIS_CMD_DENYOOM,NULL,1,1,1,0,0},
+ {"info",infoCommand,-1,0,NULL,0,0,0,0,0},
+ {"monitor",monitorCommand,1,0,NULL,0,0,0,0,0},
+ {"ttl",ttlCommand,2,0,NULL,1,1,1,0,0},
+ {"persist",persistCommand,2,0,NULL,1,1,1,0,0},
+ {"slaveof",slaveofCommand,3,0,NULL,0,0,0,0,0},
+ {"debug",debugCommand,-2,0,NULL,0,0,0,0,0},
+ {"config",configCommand,-2,0,NULL,0,0,0,0,0},
+ {"subscribe",subscribeCommand,-2,0,NULL,0,0,0,0,0},
+ {"unsubscribe",unsubscribeCommand,-1,0,NULL,0,0,0,0,0},
+ {"psubscribe",psubscribeCommand,-2,0,NULL,0,0,0,0,0},
+ {"punsubscribe",punsubscribeCommand,-1,0,NULL,0,0,0,0,0},
+ {"publish",publishCommand,3,REDIS_CMD_FORCE_REPLICATION,NULL,0,0,0,0,0},
+ {"watch",watchCommand,-2,0,noPreloadGetKeys,1,-1,1,0,0},
+ {"unwatch",unwatchCommand,1,0,NULL,0,0,0,0,0},
+ {"cluster",clusterCommand,-2,0,NULL,0,0,0,0,0},
+ {"restore",restoreCommand,4,0,NULL,0,0,0,0,0},
+ {"migrate",migrateCommand,6,0,NULL,0,0,0,0,0},
+ {"dump",dumpCommand,2,0,NULL,0,0,0,0,0},
+ {"object",objectCommand,-2,0,NULL,0,0,0,0,0},
+ {"client",clientCommand,-2,0,NULL,0,0,0,0,0}
};
/*============================ Utility functions ============================ */
-void redisLog(int level, const char *fmt, ...) {
+/* Low level logging. To use only for very big messages, otherwise
+ * redisLog() is to prefer. */
+void redisLogRaw(int level, const char *msg) {
const int syslogLevelMap[] = { LOG_DEBUG, LOG_INFO, LOG_NOTICE, LOG_WARNING };
const char *c = ".-*#";
time_t now = time(NULL);
- va_list ap;
FILE *fp;
char buf[64];
- char msg[REDIS_MAX_LOGMSG_LEN];
+ int rawmode = (level & REDIS_LOG_RAW);
+ level &= 0xff; /* clear flags */
if (level < server.verbosity) return;
fp = (server.logfile == NULL) ? stdout : fopen(server.logfile,"a");
if (!fp) return;
- va_start(ap, fmt);
- vsnprintf(msg, sizeof(msg), fmt, ap);
- va_end(ap);
-
- strftime(buf,sizeof(buf),"%d %b %H:%M:%S",localtime(&now));
- fprintf(fp,"[%d] %s %c %s\n",(int)getpid(),buf,c[level],msg);
+ if (rawmode) {
+ fprintf(fp,"%s",msg);
+ } else {
+ strftime(buf,sizeof(buf),"%d %b %H:%M:%S",localtime(&now));
+ fprintf(fp,"[%d] %s %c %s\n",(int)getpid(),buf,c[level],msg);
+ }
fflush(fp);
if (server.logfile) fclose(fp);
if (server.syslog_enabled) syslog(syslogLevelMap[level], "%s", msg);
}
+/* Like redisLogRaw() but with printf-alike support. This is the funciton that
+ * is used across the code. The raw version is only used in order to dump
+ * the INFO output on crash. */
+void redisLog(int level, const char *fmt, ...) {
+ va_list ap;
+ char msg[REDIS_MAX_LOGMSG_LEN];
+
+ if ((level&0xff) < server.verbosity) return;
+
+ va_start(ap, fmt);
+ vsnprintf(msg, sizeof(msg), fmt, ap);
+ va_end(ap);
+
+ redisLogRaw(level,msg);
+}
+
/* Redis generally does not try to recover from out of memory conditions
* when allocating objects or strings, it is not clear if it will be possible
* to report this condition to the client since the networking layer itself
abort();
}
+/* Return the UNIX time in microseconds */
+long long ustime(void) {
+ struct timeval tv;
+ long long ust;
+
+ gettimeofday(&tv, NULL);
+ ust = ((long long)tv.tv_sec)*1000000;
+ ust += tv.tv_usec;
+ return ust;
+}
+
/*====================== Hash table type implementation ==================== */
/* This is an hash table type that uses the SDS dynamic strings libary as
}
}
-/* Sets type */
+/* Sets type and diskstore negative caching hash table */
dictType setDictType = {
dictEncObjHash, /* hash function */
NULL, /* key dup */
dictListDestructor /* val destructor */
};
+/* Cluster nodes hash table, mapping nodes addresses 1.2.3.4:6379 to
+ * clusterNode structures. */
+dictType clusterNodesDictType = {
+ dictSdsHash, /* hash function */
+ NULL, /* key dup */
+ NULL, /* val dup */
+ dictSdsKeyCompare, /* key compare */
+ dictSdsDestructor, /* key destructor */
+ NULL /* val destructor */
+};
+
int htNeedsResize(dict *dict) {
long long size, used;
}
int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
- int j, loops = server.cronloops++;
+ int j, loops = server.cronloops;
REDIS_NOTUSED(eventLoop);
REDIS_NOTUSED(id);
REDIS_NOTUSED(clientData);
*/
updateLRUClock();
+ /* Record the max memory used since the server was started. */
+ if (zmalloc_used_memory() > server.stat_peak_memory)
+ server.stat_peak_memory = zmalloc_used_memory();
+
/* We received a SIGTERM, shutting down here in a safe way, as it is
* not ok doing so inside the signal handler. */
if (server.shutdown_asap) {
if ((server.maxidletime && !(loops % 100)) || server.bpop_blocked_clients)
closeTimedoutClients();
- /* Check if a background saving or AOF rewrite in progress terminated */
+ /* Check if a background saving or AOF rewrite in progress terminated. */
if (server.bgsavechildpid != -1 || server.bgrewritechildpid != -1) {
int statloc;
pid_t pid;
if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) {
+ int exitcode = WEXITSTATUS(statloc);
+ int bysignal = 0;
+
+ if (WIFSIGNALED(statloc)) bysignal = WTERMSIG(statloc);
+
if (pid == server.bgsavechildpid) {
- backgroundSaveDoneHandler(statloc);
+ backgroundSaveDoneHandler(exitcode,bysignal);
} else {
- backgroundRewriteDoneHandler(statloc);
+ backgroundRewriteDoneHandler(exitcode,bysignal);
}
updateDictResizePolicy();
}
- } else {
+ } else if (server.bgsavethread != (pthread_t) -1) {
+ if (server.bgsavethread != (pthread_t) -1) {
+ int state;
+
+ pthread_mutex_lock(&server.bgsavethread_mutex);
+ state = server.bgsavethread_state;
+ pthread_mutex_unlock(&server.bgsavethread_mutex);
+
+ if (state == REDIS_BGSAVE_THREAD_DONE_OK ||
+ state == REDIS_BGSAVE_THREAD_DONE_ERR)
+ {
+ backgroundSaveDoneHandler(
+ (state == REDIS_BGSAVE_THREAD_DONE_OK) ? 0 : 1, 0);
+ }
+ }
+ } else if (!server.ds_enabled) {
/* If there is not a background saving in progress check if
* we have to save now */
time_t now = time(NULL);
* to detect transfer failures. */
if (!(loops % 10)) replicationCron();
+ /* Run other sub-systems specific cron jobs */
+ if (server.cluster_enabled && !(loops % 10)) clusterCron();
+
+ server.cronloops++;
return 100;
}
redisAssert(ln != NULL);
c = ln->value;
listDelNode(server.unblocked_clients,ln);
+ c->flags &= ~REDIS_UNBLOCKED;
/* Process remaining data in the input buffer. */
if (c->querybuf && sdslen(c->querybuf) > 0)
server.syslog_enabled = 0;
server.syslog_ident = zstrdup("redis");
server.syslog_facility = LOG_LOCAL0;
- server.glueoutputbuf = 1;
server.daemonize = 0;
server.appendonly = 0;
server.appendfsync = APPENDFSYNC_EVERYSEC;
server.list_max_ziplist_entries = REDIS_LIST_MAX_ZIPLIST_ENTRIES;
server.list_max_ziplist_value = REDIS_LIST_MAX_ZIPLIST_VALUE;
server.set_max_intset_entries = REDIS_SET_MAX_INTSET_ENTRIES;
+ server.zset_max_ziplist_entries = REDIS_ZSET_MAX_ZIPLIST_ENTRIES;
+ server.zset_max_ziplist_value = REDIS_ZSET_MAX_ZIPLIST_VALUE;
server.shutdown_asap = 0;
+ server.cache_flush_delay = 0;
+ server.cluster_enabled = 0;
+ server.cluster.configfile = zstrdup("nodes.conf");
updateLRUClock();
resetServerSaveParams();
signal(SIGHUP, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
- setupSigSegvAction();
+ setupSignalHandlers();
if (server.syslog_enabled) {
openlog(server.syslog_ident, LOG_PID | LOG_NDELAY | LOG_NOWAIT,
server.slaves = listCreate();
server.monitors = listCreate();
server.unblocked_clients = listCreate();
- server.cache_flush_queue = listCreate();
- server.cache_flush_delay = 0;
+ server.cache_io_queue = listCreate();
createSharedObjects();
server.el = aeCreateEventLoop();
server.db = zmalloc(sizeof(redisDb)*server.dbnum);
- server.ipfd = anetTcpServer(server.neterr,server.port,server.bindaddr);
- if (server.ipfd == ANET_ERR) {
- redisLog(REDIS_WARNING, "Opening port: %s", server.neterr);
- exit(1);
+
+ if (server.port != 0) {
+ server.ipfd = anetTcpServer(server.neterr,server.port,server.bindaddr);
+ if (server.ipfd == ANET_ERR) {
+ redisLog(REDIS_WARNING, "Opening port: %s", server.neterr);
+ exit(1);
+ }
}
if (server.unixsocket != NULL) {
unlink(server.unixsocket); /* don't care if this fails */
server.db[j].expires = dictCreate(&keyptrDictType,NULL);
server.db[j].blocking_keys = dictCreate(&keylistDictType,NULL);
server.db[j].watched_keys = dictCreate(&keylistDictType,NULL);
- if (server.ds_enabled)
+ if (server.ds_enabled) {
server.db[j].io_keys = dictCreate(&keylistDictType,NULL);
+ server.db[j].io_negcache = dictCreate(&setDictType,NULL);
+ server.db[j].io_queued = dictCreate(&setDictType,NULL);
+ }
server.db[j].id = j;
}
server.pubsub_channels = dictCreate(&keylistDictType,NULL);
server.cronloops = 0;
server.bgsavechildpid = -1;
server.bgrewritechildpid = -1;
+ server.bgsavethread_state = REDIS_BGSAVE_THREAD_UNACTIVE;
+ server.bgsavethread = (pthread_t) -1;
server.bgrewritebuf = sdsempty();
server.aofbuf = sdsempty();
server.lastsave = time(NULL);
server.stat_starttime = time(NULL);
server.stat_keyspace_misses = 0;
server.stat_keyspace_hits = 0;
+ server.stat_peak_memory = 0;
server.unixtime = time(NULL);
aeCreateTimeEvent(server.el, 1, serverCron, NULL, NULL);
if (server.ipfd > 0 && aeCreateFileEvent(server.el,server.ipfd,AE_READABLE,
}
if (server.ds_enabled) dsInit();
+ if (server.cluster_enabled) clusterInit();
+ srand(time(NULL)^getpid());
}
/* Populates the Redis Command Table starting from the hard coded list
* 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);
}
}
+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) {
/* Call() is the core of Redis execution of a command */
void call(redisClient *c, struct redisCommand *cmd) {
- long long dirty;
+ long long dirty, start = ustime();
dirty = server.dirty;
cmd->proc(c);
dirty = server.dirty-dirty;
+ cmd->microseconds += ustime()-start;
+ cmd->calls++;
if (server.appendonly && dirty)
feedAppendOnlyFile(cmd,c->db->id,c->argv,c->argc);
return REDIS_OK;
}
+ /* If cluster is enabled, redirect here */
+ if (server.cluster_enabled &&
+ !(cmd->getkeys_proc == NULL && cmd->firstkey == 0)) {
+ int hashslot;
+
+ if (server.cluster.state != REDIS_CLUSTER_OK) {
+ addReplyError(c,"The cluster is down. Check with CLUSTER INFO for more information");
+ return REDIS_OK;
+ } else {
+ int ask;
+ clusterNode *n = getNodeByQuery(c,cmd,c->argv,c->argc,&hashslot,&ask);
+ if (n == NULL) {
+ addReplyError(c,"Multi keys request invalid in cluster");
+ return REDIS_OK;
+ } else if (n != server.cluster.myself) {
+ addReplySds(c,sdscatprintf(sdsempty(),
+ "-%s %d %s:%d\r\n", ask ? "ASK" : "MOVED",
+ hashslot,n->ip,n->port));
+ return REDIS_OK;
+ }
+ }
+ }
+
/* Handle the maxmemory directive.
*
* First we try to free some memory if possible (if there are volatile
/* Create the string returned by the INFO command. This is decoupled
* by the INFO command itself as we need to report the same information
* on memory corruption problems. */
-sds genRedisInfoString(void) {
- sds info;
+sds genRedisInfoString(char *section) {
+ sds info = sdsempty();
time_t uptime = time(NULL)-server.stat_starttime;
- int j;
- char hmem[64];
+ int j, numcommands;
struct rusage self_ru, c_ru;
+ unsigned long lol, bib;
+ int allsections = 0, defsections = 0;
+ int sections = 0;
+
+ if (section) {
+ allsections = strcasecmp(section,"all") == 0;
+ defsections = strcasecmp(section,"default") == 0;
+ }
getrusage(RUSAGE_SELF, &self_ru);
getrusage(RUSAGE_CHILDREN, &c_ru);
+ getClientsMaxBuffers(&lol,&bib);
+
+ /* Server */
+ if (allsections || defsections || !strcasecmp(section,"server")) {
+ if (sections++) info = sdscat(info,"\r\n");
+ info = sdscatprintf(info,
+ "# Server\r\n"
+ "redis_version:%s\r\n"
+ "redis_git_sha1:%s\r\n"
+ "redis_git_dirty:%d\r\n"
+ "arch_bits:%s\r\n"
+ "multiplexing_api:%s\r\n"
+ "process_id:%ld\r\n"
+ "tcp_port:%d\r\n"
+ "uptime_in_seconds:%ld\r\n"
+ "uptime_in_days:%ld\r\n"
+ "lru_clock:%ld\r\n",
+ REDIS_VERSION,
+ redisGitSHA1(),
+ strtol(redisGitDirty(),NULL,10) > 0,
+ (sizeof(long) == 8) ? "64" : "32",
+ aeGetApiName(),
+ (long) getpid(),
+ server.port,
+ uptime,
+ uptime/(3600*24),
+ (unsigned long) server.lruclock);
+ }
+
+ /* Clients */
+ if (allsections || defsections || !strcasecmp(section,"clients")) {
+ if (sections++) info = sdscat(info,"\r\n");
+ info = sdscatprintf(info,
+ "# Clients\r\n"
+ "connected_clients:%d\r\n"
+ "client_longest_output_list:%lu\r\n"
+ "client_biggest_input_buf:%lu\r\n"
+ "blocked_clients:%d\r\n",
+ listLength(server.clients)-listLength(server.slaves),
+ lol, bib,
+ server.bpop_blocked_clients);
+ }
+
+ /* Memory */
+ if (allsections || defsections || !strcasecmp(section,"memory")) {
+ char hmem[64];
+ char peak_hmem[64];
+
+ bytesToHuman(hmem,zmalloc_used_memory());
+ bytesToHuman(peak_hmem,server.stat_peak_memory);
+ if (sections++) info = sdscat(info,"\r\n");
+ info = sdscatprintf(info,
+ "# Memory\r\n"
+ "used_memory:%zu\r\n"
+ "used_memory_human:%s\r\n"
+ "used_memory_rss:%zu\r\n"
+ "used_memory_peak:%zu\r\n"
+ "used_memory_peak_human:%s\r\n"
+ "mem_fragmentation_ratio:%.2f\r\n"
+ "mem_allocator:%s\r\n",
+ zmalloc_used_memory(),
+ hmem,
+ zmalloc_get_rss(),
+ server.stat_peak_memory,
+ peak_hmem,
+ zmalloc_get_fragmentation_ratio(),
+ REDIS_MALLOC
+ );
+ }
+
+ /* Allocation statistics */
+ if (allsections || !strcasecmp(section,"allocstats")) {
+ if (sections++) info = sdscat(info,"\r\n");
+ info = sdscat(info, "# Allocstats\r\nallocation_stats:");
+ for (j = 0; j <= ZMALLOC_MAX_ALLOC_STAT; j++) {
+ size_t count = zmalloc_allocations_for_size(j);
+ if (count) {
+ if (info[sdslen(info)-1] != ':') info = sdscatlen(info,",",1);
+ info = sdscatprintf(info,"%s%d=%zu",
+ (j == ZMALLOC_MAX_ALLOC_STAT) ? ">=" : "",
+ j,count);
+ }
+ }
+ info = sdscat(info,"\r\n");
+ }
+
+ /* Persistence */
+ if (allsections || defsections || !strcasecmp(section,"persistence")) {
+ if (sections++) info = sdscat(info,"\r\n");
+ info = sdscatprintf(info,
+ "# Persistence\r\n"
+ "loading:%d\r\n"
+ "aof_enabled:%d\r\n"
+ "changes_since_last_save:%lld\r\n"
+ "bgsave_in_progress:%d\r\n"
+ "last_save_time:%ld\r\n"
+ "bgrewriteaof_in_progress:%d\r\n",
+ server.loading,
+ server.appendonly,
+ server.dirty,
+ server.bgsavechildpid != -1 ||
+ server.bgsavethread != (pthread_t) -1,
+ server.lastsave,
+ server.bgrewritechildpid != -1);
+
+ if (server.loading) {
+ double perc;
+ time_t eta, elapsed;
+ off_t remaining_bytes = server.loading_total_bytes-
+ server.loading_loaded_bytes;
+
+ perc = ((double)server.loading_loaded_bytes /
+ server.loading_total_bytes) * 100;
+
+ elapsed = time(NULL)-server.loading_start_time;
+ if (elapsed == 0) {
+ eta = 1; /* A fake 1 second figure if we don't have
+ enough info */
+ } else {
+ eta = (elapsed*remaining_bytes)/server.loading_loaded_bytes;
+ }
+
+ info = sdscatprintf(info,
+ "loading_start_time:%ld\r\n"
+ "loading_total_bytes:%llu\r\n"
+ "loading_loaded_bytes:%llu\r\n"
+ "loading_loaded_perc:%.2f\r\n"
+ "loading_eta_seconds:%ld\r\n"
+ ,(unsigned long) server.loading_start_time,
+ (unsigned long long) server.loading_total_bytes,
+ (unsigned long long) server.loading_loaded_bytes,
+ perc,
+ eta
+ );
+ }
+ }
+
+ /* Diskstore */
+ if (allsections || defsections || !strcasecmp(section,"diskstore")) {
+ if (sections++) info = sdscat(info,"\r\n");
+ info = sdscatprintf(info,
+ "# Diskstore\r\n"
+ "ds_enabled:%d\r\n",
+ server.ds_enabled != 0);
+ if (server.ds_enabled) {
+ lockThreadedIO();
+ info = sdscatprintf(info,
+ "cache_max_memory:%llu\r\n"
+ "cache_blocked_clients:%lu\r\n"
+ "cache_io_queue_len:%lu\r\n"
+ "cache_io_jobs_new:%lu\r\n"
+ "cache_io_jobs_processing:%lu\r\n"
+ "cache_io_jobs_processed:%lu\r\n"
+ "cache_io_ready_clients:%lu\r\n"
+ ,(unsigned long long) server.cache_max_memory,
+ (unsigned long) server.cache_blocked_clients,
+ (unsigned long) listLength(server.cache_io_queue),
+ (unsigned long) listLength(server.io_newjobs),
+ (unsigned long) listLength(server.io_processing),
+ (unsigned long) listLength(server.io_processed),
+ (unsigned long) listLength(server.io_ready_clients)
+ );
+ unlockThreadedIO();
+ }
+ }
+
+ /* Stats */
+ if (allsections || defsections || !strcasecmp(section,"stats")) {
+ if (sections++) info = sdscat(info,"\r\n");
+ info = sdscatprintf(info,
+ "# Stats\r\n"
+ "total_connections_received:%lld\r\n"
+ "total_commands_processed:%lld\r\n"
+ "expired_keys:%lld\r\n"
+ "evicted_keys:%lld\r\n"
+ "keyspace_hits:%lld\r\n"
+ "keyspace_misses:%lld\r\n"
+ "pubsub_channels:%ld\r\n"
+ "pubsub_patterns:%u\r\n",
+ server.stat_numconnections,
+ server.stat_numcommands,
+ server.stat_expiredkeys,
+ server.stat_evictedkeys,
+ server.stat_keyspace_hits,
+ server.stat_keyspace_misses,
+ dictSize(server.pubsub_channels),
+ listLength(server.pubsub_patterns));
+ }
+
+ /* Replication */
+ if (allsections || defsections || !strcasecmp(section,"replication")) {
+ if (sections++) info = sdscat(info,"\r\n");
+ info = sdscatprintf(info,
+ "# Replication\r\n"
+ "role:%s\r\n",
+ server.masterhost == NULL ? "master" : "slave");
+ if (server.masterhost) {
+ info = sdscatprintf(info,
+ "master_host:%s\r\n"
+ "master_port:%d\r\n"
+ "master_link_status:%s\r\n"
+ "master_last_io_seconds_ago:%d\r\n"
+ "master_sync_in_progress:%d\r\n"
+ ,server.masterhost,
+ server.masterport,
+ (server.replstate == REDIS_REPL_CONNECTED) ?
+ "up" : "down",
+ server.master ?
+ ((int)(time(NULL)-server.master->lastinteraction)) : -1,
+ server.replstate == REDIS_REPL_TRANSFER
+ );
+
+ if (server.replstate == REDIS_REPL_TRANSFER) {
+ info = sdscatprintf(info,
+ "master_sync_left_bytes:%ld\r\n"
+ "master_sync_last_io_seconds_ago:%d\r\n"
+ ,(long)server.repl_transfer_left,
+ (int)(time(NULL)-server.repl_transfer_lastio)
+ );
+ }
+ }
+ info = sdscatprintf(info,
+ "connected_slaves:%d\r\n",
+ listLength(server.slaves));
+ }
- bytesToHuman(hmem,zmalloc_used_memory());
- info = sdscatprintf(sdsempty(),
- "redis_version:%s\r\n"
- "redis_git_sha1:%s\r\n"
- "redis_git_dirty:%d\r\n"
- "arch_bits:%s\r\n"
- "multiplexing_api:%s\r\n"
- "process_id:%ld\r\n"
- "uptime_in_seconds:%ld\r\n"
- "uptime_in_days:%ld\r\n"
- "lru_clock:%ld\r\n"
+ /* CPU */
+ if (allsections || defsections || !strcasecmp(section,"cpu")) {
+ if (sections++) info = sdscat(info,"\r\n");
+ info = sdscatprintf(info,
+ "# CPU\r\n"
"used_cpu_sys:%.2f\r\n"
"used_cpu_user:%.2f\r\n"
"used_cpu_sys_childrens:%.2f\r\n"
- "used_cpu_user_childrens:%.2f\r\n"
- "connected_clients:%d\r\n"
- "connected_slaves:%d\r\n"
- "blocked_clients:%d\r\n"
- "used_memory:%zu\r\n"
- "used_memory_human:%s\r\n"
- "used_memory_rss:%zu\r\n"
- "mem_fragmentation_ratio:%.2f\r\n"
- "use_tcmalloc:%d\r\n"
- "loading:%d\r\n"
- "aof_enabled:%d\r\n"
- "changes_since_last_save:%lld\r\n"
- "bgsave_in_progress:%d\r\n"
- "last_save_time:%ld\r\n"
- "bgrewriteaof_in_progress:%d\r\n"
- "total_connections_received:%lld\r\n"
- "total_commands_processed:%lld\r\n"
- "expired_keys:%lld\r\n"
- "evicted_keys:%lld\r\n"
- "keyspace_hits:%lld\r\n"
- "keyspace_misses:%lld\r\n"
- "hash_max_zipmap_entries:%zu\r\n"
- "hash_max_zipmap_value:%zu\r\n"
- "pubsub_channels:%ld\r\n"
- "pubsub_patterns:%u\r\n"
- "ds_enabled:%d\r\n"
- "role:%s\r\n"
- ,REDIS_VERSION,
- redisGitSHA1(),
- strtol(redisGitDirty(),NULL,10) > 0,
- (sizeof(long) == 8) ? "64" : "32",
- aeGetApiName(),
- (long) getpid(),
- uptime,
- uptime/(3600*24),
- (unsigned long) server.lruclock,
+ "used_cpu_user_childrens:%.2f\r\n",
(float)self_ru.ru_utime.tv_sec+(float)self_ru.ru_utime.tv_usec/1000000,
(float)self_ru.ru_stime.tv_sec+(float)self_ru.ru_stime.tv_usec/1000000,
(float)c_ru.ru_utime.tv_sec+(float)c_ru.ru_utime.tv_usec/1000000,
- (float)c_ru.ru_stime.tv_sec+(float)c_ru.ru_stime.tv_usec/1000000,
- listLength(server.clients)-listLength(server.slaves),
- listLength(server.slaves),
- server.bpop_blocked_clients,
- zmalloc_used_memory(),
- hmem,
- zmalloc_get_rss(),
- zmalloc_get_fragmentation_ratio(),
-#ifdef USE_TCMALLOC
- 1,
-#else
- 0,
-#endif
- server.loading,
- server.appendonly,
- server.dirty,
- server.bgsavechildpid != -1,
- server.lastsave,
- server.bgrewritechildpid != -1,
- server.stat_numconnections,
- server.stat_numcommands,
- server.stat_expiredkeys,
- server.stat_evictedkeys,
- server.stat_keyspace_hits,
- server.stat_keyspace_misses,
- server.hash_max_zipmap_entries,
- server.hash_max_zipmap_value,
- dictSize(server.pubsub_channels),
- listLength(server.pubsub_patterns),
- server.ds_enabled != 0,
- server.masterhost == NULL ? "master" : "slave"
- );
- if (server.masterhost) {
- info = sdscatprintf(info,
- "master_host:%s\r\n"
- "master_port:%d\r\n"
- "master_link_status:%s\r\n"
- "master_last_io_seconds_ago:%d\r\n"
- "master_sync_in_progress:%d\r\n"
- ,server.masterhost,
- server.masterport,
- (server.replstate == REDIS_REPL_CONNECTED) ?
- "up" : "down",
- server.master ? ((int)(time(NULL)-server.master->lastinteraction)) : -1,
- server.replstate == REDIS_REPL_TRANSFER
- );
-
- if (server.replstate == REDIS_REPL_TRANSFER) {
+ (float)c_ru.ru_stime.tv_sec+(float)c_ru.ru_stime.tv_usec/1000000);
+ }
+
+ /* cmdtime */
+ if (allsections || !strcasecmp(section,"commandstats")) {
+ if (sections++) info = sdscat(info,"\r\n");
+ info = sdscatprintf(info, "# Commandstats\r\n");
+ numcommands = sizeof(redisCommandTable)/sizeof(struct redisCommand);
+ for (j = 0; j < numcommands; j++) {
+ struct redisCommand *c = redisCommandTable+j;
+
+ if (!c->calls) continue;
info = sdscatprintf(info,
- "master_sync_left_bytes:%ld\r\n"
- "master_sync_last_io_seconds_ago:%d\r\n"
- ,(long)server.repl_transfer_left,
- (int)(time(NULL)-server.repl_transfer_lastio)
- );
+ "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));
}
}
- if (server.ds_enabled) {
- lockThreadedIO();
- info = sdscatprintf(info,
- "cache_max_memory:%llu\r\n"
- "cache_blocked_clients:%lu\r\n"
- ,(unsigned long long) server.cache_max_memory,
- (unsigned long) server.cache_blocked_clients
- );
- unlockThreadedIO();
- }
- if (server.loading) {
- double perc;
- time_t eta, elapsed;
- off_t remaining_bytes = server.loading_total_bytes-
- server.loading_loaded_bytes;
-
- perc = ((double)server.loading_loaded_bytes /
- server.loading_total_bytes) * 100;
-
- elapsed = time(NULL)-server.loading_start_time;
- if (elapsed == 0) {
- eta = 1; /* A fake 1 second figure if we don't have enough info */
- } else {
- eta = (elapsed*remaining_bytes)/server.loading_loaded_bytes;
- }
+ /* Clusetr */
+ if (allsections || defsections || !strcasecmp(section,"cluster")) {
+ if (sections++) info = sdscat(info,"\r\n");
info = sdscatprintf(info,
- "loading_start_time:%ld\r\n"
- "loading_total_bytes:%llu\r\n"
- "loading_loaded_bytes:%llu\r\n"
- "loading_loaded_perc:%.2f\r\n"
- "loading_eta_seconds:%ld\r\n"
- ,(unsigned long) server.loading_start_time,
- (unsigned long long) server.loading_total_bytes,
- (unsigned long long) server.loading_loaded_bytes,
- perc,
- eta
- );
+ "# Cluster\r\n"
+ "cluster_enabled:%d\r\n",
+ server.cluster_enabled);
}
- for (j = 0; j < server.dbnum; j++) {
- long long keys, vkeys;
- keys = dictSize(server.db[j].dict);
- vkeys = dictSize(server.db[j].expires);
- if (keys || vkeys) {
- info = sdscatprintf(info, "db%d:keys=%lld,expires=%lld\r\n",
- j, keys, vkeys);
+ /* Key space */
+ if (allsections || defsections || !strcasecmp(section,"keyspace")) {
+ if (sections++) info = sdscat(info,"\r\n");
+ info = sdscatprintf(info, "# Keyspace\r\n");
+ for (j = 0; j < server.dbnum; j++) {
+ long long keys, vkeys;
+
+ keys = dictSize(server.db[j].dict);
+ vkeys = dictSize(server.db[j].expires);
+ if (keys || vkeys) {
+ info = sdscatprintf(info, "db%d:keys=%lld,expires=%lld\r\n",
+ j, keys, vkeys);
+ }
}
}
return info;
}
void infoCommand(redisClient *c) {
- sds info = genRedisInfoString();
+ char *section = c->argc == 2 ? c->argv[1]->ptr : "default";
+
+ if (c->argc > 2) {
+ addReply(c,shared.syntaxerr);
+ return;
+ }
+ sds info = genRedisInfoString(section);
addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n",
(unsigned long)sdslen(info)));
addReplySds(c,info);
/* Finally remove the selected key. */
if (bestkey) {
robj *keyobj = createStringObject(bestkey,sdslen(bestkey));
+ propagateExpire(db,keyobj);
dbDelete(db,keyobj);
server.stat_evictedkeys++;
decrRefCount(keyobj);
/* Try to write the pid file in a best-effort way. */
FILE *fp = fopen(server.pidfile,"w");
if (fp) {
- fprintf(fp,"%d\n",getpid());
+ fprintf(fp,"%d\n",(int)getpid());
fclose(fp);
}
}
exit(1);
}
+void redisAsciiArt(void) {
+#include "asciilogo.h"
+ char *buf = zmalloc(1024*16);
+
+ snprintf(buf,1024*16,ascii_logo,
+ REDIS_VERSION,
+ redisGitSHA1(),
+ strtol(redisGitDirty(),NULL,10) > 0,
+ (sizeof(long) == 8) ? "64" : "32",
+ server.cluster_enabled ? "cluster" : "stand alone",
+ server.port,
+ (long) getpid()
+ );
+ redisLogRaw(REDIS_NOTICE|REDIS_LOG_RAW,buf);
+ zfree(buf);
+}
+
int main(int argc, char **argv) {
- time_t start;
+ long long start;
initServerConfig();
if (argc == 2) {
if (server.daemonize) daemonize();
initServer();
if (server.daemonize) createPidFile();
+ redisAsciiArt();
redisLog(REDIS_NOTICE,"Server started, Redis version " REDIS_VERSION);
#ifdef __linux__
linuxOvercommitMemoryWarning();
#endif
- start = time(NULL);
+ start = ustime();
if (server.ds_enabled) {
redisLog(REDIS_NOTICE,"DB not loaded (running with disk back end)");
} else if (server.appendonly) {
if (loadAppendOnlyFile(server.appendfilename) == REDIS_OK)
- redisLog(REDIS_NOTICE,"DB loaded from append only file: %ld seconds",time(NULL)-start);
+ redisLog(REDIS_NOTICE,"DB loaded from append only file: %.3f seconds",(float)(ustime()-start)/1000000);
} else {
if (rdbLoad(server.dbfilename) == REDIS_OK)
- redisLog(REDIS_NOTICE,"DB loaded from disk: %ld seconds",time(NULL)-start);
+ redisLog(REDIS_NOTICE,"DB loaded from disk: %.3f seconds",(float)(ustime()-start)/1000000);
}
if (server.ipfd > 0)
redisLog(REDIS_NOTICE,"The server is now ready to accept connections on port %d", server.port);
return 0;
}
-/* ============================= Backtrace support ========================= */
-
#ifdef HAVE_BACKTRACE
-void *getMcontextEip(ucontext_t *uc) {
+static void *getMcontextEip(ucontext_t *uc) {
#if defined(__FreeBSD__)
return (void*) uc->uc_mcontext.mc_eip;
#elif defined(__dietlibc__)
#endif
}
-void segvHandler(int sig, siginfo_t *info, void *secret) {
+static void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
void *trace[100];
char **messages = NULL;
int i, trace_size = 0;
redisLog(REDIS_WARNING,
"======= Ooops! Redis %s got signal: -%d- =======", REDIS_VERSION, sig);
- infostring = genRedisInfoString();
- redisLog(REDIS_WARNING, "%s",infostring);
+ infostring = genRedisInfoString("all");
+ redisLogRaw(REDIS_WARNING, infostring);
/* It's not safe to sdsfree() the returned string under memory
* corruption conditions. Let it leak as we are going to abort */
sigaction (sig, &act, NULL);
kill(getpid(),sig);
}
+#endif /* HAVE_BACKTRACE */
-void sigtermHandler(int sig) {
+static void sigtermHandler(int sig) {
REDIS_NOTUSED(sig);
- redisLog(REDIS_WARNING,"SIGTERM received, scheduling shutting down...");
+ redisLog(REDIS_WARNING,"Received SIGTERM, scheduling shutdown...");
server.shutdown_asap = 1;
}
-void setupSigSegvAction(void) {
+void setupSignalHandlers(void) {
struct sigaction act;
- sigemptyset (&act.sa_mask);
- /* When the SA_SIGINFO flag is set in sa_flags then sa_sigaction
- * is used. Otherwise, sa_handler is used */
- act.sa_flags = SA_NODEFER | SA_ONSTACK | SA_RESETHAND | SA_SIGINFO;
- act.sa_sigaction = segvHandler;
- sigaction (SIGSEGV, &act, NULL);
- sigaction (SIGBUS, &act, NULL);
- sigaction (SIGFPE, &act, NULL);
- sigaction (SIGILL, &act, NULL);
- sigaction (SIGBUS, &act, NULL);
-
+ /* When the SA_SIGINFO flag is set in sa_flags then sa_sigaction is used.
+ * Otherwise, sa_handler is used. */
+ sigemptyset(&act.sa_mask);
act.sa_flags = SA_NODEFER | SA_ONSTACK | SA_RESETHAND;
act.sa_handler = sigtermHandler;
- sigaction (SIGTERM, &act, NULL);
- return;
-}
+ sigaction(SIGTERM, &act, NULL);
-#else /* HAVE_BACKTRACE */
-void setupSigSegvAction(void) {
+#ifdef HAVE_BACKTRACE
+ sigemptyset(&act.sa_mask);
+ act.sa_flags = SA_NODEFER | SA_ONSTACK | SA_RESETHAND | SA_SIGINFO;
+ act.sa_sigaction = sigsegvHandler;
+ sigaction(SIGSEGV, &act, NULL);
+ sigaction(SIGBUS, &act, NULL);
+ sigaction(SIGFPE, &act, NULL);
+ sigaction(SIGILL, &act, NULL);
+#endif
+ return;
}
-#endif /* HAVE_BACKTRACE */
/* The End */
projects / redis.git / blobdiff