Commit 60ff8095 authored by antirez's avatar antirez
Browse files

No more trailing spaces in Redis source code.

parent e9cd75dc
...@@ -178,7 +178,7 @@ void listDelNode(list *list, listNode *node) ...@@ -178,7 +178,7 @@ void listDelNode(list *list, listNode *node)
listIter *listGetIterator(list *list, int direction) listIter *listGetIterator(list *list, int direction)
{ {
listIter *iter; listIter *iter;
if ((iter = zmalloc(sizeof(*iter))) == NULL) return NULL; if ((iter = zmalloc(sizeof(*iter))) == NULL) return NULL;
if (direction == AL_START_HEAD) if (direction == AL_START_HEAD)
iter->next = list->head; iter->next = list->head;
......
...@@ -54,7 +54,7 @@ static int aeApiCreate(aeEventLoop *eventLoop) { ...@@ -54,7 +54,7 @@ static int aeApiCreate(aeEventLoop *eventLoop) {
return -1; return -1;
} }
eventLoop->apidata = state; eventLoop->apidata = state;
return 0; return 0;
} }
static int aeApiResize(aeEventLoop *eventLoop, int setsize) { static int aeApiResize(aeEventLoop *eventLoop, int setsize) {
...@@ -75,7 +75,7 @@ static void aeApiFree(aeEventLoop *eventLoop) { ...@@ -75,7 +75,7 @@ static void aeApiFree(aeEventLoop *eventLoop) {
static int aeApiAddEvent(aeEventLoop *eventLoop, int fd, int mask) { static int aeApiAddEvent(aeEventLoop *eventLoop, int fd, int mask) {
aeApiState *state = eventLoop->apidata; aeApiState *state = eventLoop->apidata;
struct kevent ke; struct kevent ke;
if (mask & AE_READABLE) { if (mask & AE_READABLE) {
EV_SET(&ke, fd, EVFILT_READ, EV_ADD, 0, 0, NULL); EV_SET(&ke, fd, EVFILT_READ, EV_ADD, 0, 0, NULL);
if (kevent(state->kqfd, &ke, 1, NULL, 0, NULL) == -1) return -1; if (kevent(state->kqfd, &ke, 1, NULL, 0, NULL) == -1) return -1;
...@@ -118,16 +118,16 @@ static int aeApiPoll(aeEventLoop *eventLoop, struct timeval *tvp) { ...@@ -118,16 +118,16 @@ static int aeApiPoll(aeEventLoop *eventLoop, struct timeval *tvp) {
if (retval > 0) { if (retval > 0) {
int j; int j;
numevents = retval; numevents = retval;
for(j = 0; j < numevents; j++) { for(j = 0; j < numevents; j++) {
int mask = 0; int mask = 0;
struct kevent *e = state->events+j; struct kevent *e = state->events+j;
if (e->filter == EVFILT_READ) mask |= AE_READABLE; if (e->filter == EVFILT_READ) mask |= AE_READABLE;
if (e->filter == EVFILT_WRITE) mask |= AE_WRITABLE; if (e->filter == EVFILT_WRITE) mask |= AE_WRITABLE;
eventLoop->fired[j].fd = e->ident; eventLoop->fired[j].fd = e->ident;
eventLoop->fired[j].mask = mask; eventLoop->fired[j].mask = mask;
} }
} }
return numevents; return numevents;
......
...@@ -137,7 +137,7 @@ int anetEnableTcpNoDelay(char *err, int fd) ...@@ -137,7 +137,7 @@ int anetEnableTcpNoDelay(char *err, int fd)
return anetSetTcpNoDelay(err, fd, 1); return anetSetTcpNoDelay(err, fd, 1);
} }
int anetDisableTcpNoDelay(char *err, int fd) int anetDisableTcpNoDelay(char *err, int fd)
{ {
return anetSetTcpNoDelay(err, fd, 0); return anetSetTcpNoDelay(err, fd, 0);
} }
......
...@@ -1255,7 +1255,7 @@ struct rewriteConfigState *rewriteConfigReadOldFile(char *path) { ...@@ -1255,7 +1255,7 @@ struct rewriteConfigState *rewriteConfigReadOldFile(char *path) {
* "force" is non-zero, the line is appended to the configuration file. * "force" is non-zero, the line is appended to the configuration file.
* Usually "force" is true when an option has not its default value, so it * Usually "force" is true when an option has not its default value, so it
* must be rewritten even if not present previously. * must be rewritten even if not present previously.
* *
* The first time a line is appended into a configuration file, a comment * The first time a line is appended into a configuration file, a comment
* is added to show that starting from that point the config file was generated * is added to show that starting from that point the config file was generated
* by CONFIG REWRITE. * by CONFIG REWRITE.
...@@ -1381,7 +1381,7 @@ void rewriteConfigEnumOption(struct rewriteConfigState *state, char *option, int ...@@ -1381,7 +1381,7 @@ void rewriteConfigEnumOption(struct rewriteConfigState *state, char *option, int
char *enum_name, *matching_name = NULL; char *enum_name, *matching_name = NULL;
int enum_val, def_val, force; int enum_val, def_val, force;
sds line; sds line;
va_start(ap, value); va_start(ap, value);
while(1) { while(1) {
enum_name = va_arg(ap,char*); enum_name = va_arg(ap,char*);
......
...@@ -103,7 +103,7 @@ void dbAdd(redisDb *db, robj *key, robj *val) { ...@@ -103,7 +103,7 @@ void dbAdd(redisDb *db, robj *key, robj *val) {
* The program is aborted if the key was not already present. */ * The program is aborted if the key was not already present. */
void dbOverwrite(redisDb *db, robj *key, robj *val) { void dbOverwrite(redisDb *db, robj *key, robj *val) {
struct dictEntry *de = dictFind(db->dict,key->ptr); struct dictEntry *de = dictFind(db->dict,key->ptr);
redisAssertWithInfo(NULL,key,de != NULL); redisAssertWithInfo(NULL,key,de != NULL);
dictReplace(db->dict, key->ptr, val); dictReplace(db->dict, key->ptr, val);
} }
...@@ -816,7 +816,7 @@ int expireIfNeeded(redisDb *db, robj *key) { ...@@ -816,7 +816,7 @@ int expireIfNeeded(redisDb *db, robj *key) {
* the slave key expiration is controlled by the master that will * the slave key expiration is controlled by the master that will
* send us synthesized DEL operations for expired keys. * send us synthesized DEL operations for expired keys.
* *
* Still we try to return the right information to the caller, * Still we try to return the right information to the caller,
* that is, 0 if we think the key should be still valid, 1 if * that is, 0 if we think the key should be still valid, 1 if
* we think the key is expired at this time. */ * we think the key is expired at this time. */
if (server.masterhost != NULL) return now > when; if (server.masterhost != NULL) return now > when;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __ENDIANCONV_H #ifndef __ENDIANCONV_H
#define __ENDIANCONV_H #define __ENDIANCONV_H
......
/* /*
* Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de> * Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
* *
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
* CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
* and lzf_c.c. * and lzf_c.c.
* *
*/ */
unsigned int unsigned int
lzf_compress (const void *const in_data, unsigned int in_len, lzf_compress (const void *const in_data, unsigned int in_len,
void *out_data, unsigned int out_len); void *out_data, unsigned int out_len);
...@@ -92,7 +92,7 @@ lzf_compress (const void *const in_data, unsigned int in_len, ...@@ -92,7 +92,7 @@ lzf_compress (const void *const in_data, unsigned int in_len,
* *
* This function is very fast, about as fast as a copying loop. * This function is very fast, about as fast as a copying loop.
*/ */
unsigned int unsigned int
lzf_decompress (const void *const in_data, unsigned int in_len, lzf_decompress (const void *const in_data, unsigned int in_len,
void *out_data, unsigned int out_len); void *out_data, unsigned int out_len);
......
/* /*
* Copyright (c) 2000-2007 Marc Alexander Lehmann <schmorp@schmorp.de> * Copyright (c) 2000-2007 Marc Alexander Lehmann <schmorp@schmorp.de>
* *
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
* CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
......
/* /*
* Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de> * Copyright (c) 2000-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
* *
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
* CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
......
/* /*
* Copyright (c) 2000-2007 Marc Alexander Lehmann <schmorp@schmorp.de> * Copyright (c) 2000-2007 Marc Alexander Lehmann <schmorp@schmorp.de>
* *
* Redistribution and use in source and binary forms, with or without modifica- * Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met: * tion, are permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, * 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer. * this list of conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
* CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#endif #endif
*/ */
unsigned int unsigned int
lzf_decompress (const void *const in_data, unsigned int in_len, lzf_decompress (const void *const in_data, unsigned int in_len,
void *out_data, unsigned int out_len) void *out_data, unsigned int out_len)
{ {
......
...@@ -149,7 +149,7 @@ void migrateCommand(redisClient *c) { ...@@ -149,7 +149,7 @@ void migrateCommand(redisClient *c) {
addReplySds(c,sdsnew("+NOKEY\r\n")); addReplySds(c,sdsnew("+NOKEY\r\n"));
return; return;
} }
/* Connect */ /* Connect */
fd = anetTcpNonBlockConnect(server.neterr,c->argv[1]->ptr, fd = anetTcpNonBlockConnect(server.neterr,c->argv[1]->ptr,
atoi(c->argv[2]->ptr)); atoi(c->argv[2]->ptr));
......
...@@ -214,7 +214,7 @@ void watchForKey(redisClient *c, robj *key) { ...@@ -214,7 +214,7 @@ void watchForKey(redisClient *c, robj *key) {
} }
/* This key is not already watched in this DB. Let's add it */ /* This key is not already watched in this DB. Let's add it */
clients = dictFetchValue(c->db->watched_keys,key); clients = dictFetchValue(c->db->watched_keys,key);
if (!clients) { if (!clients) {
clients = listCreate(); clients = listCreate();
dictAdd(c->db->watched_keys,key,clients); dictAdd(c->db->watched_keys,key,clients);
incrRefCount(key); incrRefCount(key);
......
...@@ -1461,7 +1461,7 @@ void rewriteClientCommandVector(redisClient *c, int argc, ...) { ...@@ -1461,7 +1461,7 @@ void rewriteClientCommandVector(redisClient *c, int argc, ...) {
va_start(ap,argc); va_start(ap,argc);
for (j = 0; j < argc; j++) { for (j = 0; j < argc; j++) {
robj *a; robj *a;
a = va_arg(ap, robj*); a = va_arg(ap, robj*);
argv[j] = a; argv[j] = a;
incrRefCount(a); incrRefCount(a);
...@@ -1483,7 +1483,7 @@ void rewriteClientCommandVector(redisClient *c, int argc, ...) { ...@@ -1483,7 +1483,7 @@ void rewriteClientCommandVector(redisClient *c, int argc, ...) {
* The new val ref count is incremented, and the old decremented. */ * The new val ref count is incremented, and the old decremented. */
void rewriteClientCommandArgument(redisClient *c, int i, robj *newval) { void rewriteClientCommandArgument(redisClient *c, int i, robj *newval) {
robj *oldval; robj *oldval;
redisAssertWithInfo(c,NULL,i < c->argc); redisAssertWithInfo(c,NULL,i < c->argc);
oldval = c->argv[i]; oldval = c->argv[i];
c->argv[i] = newval; c->argv[i] = newval;
......
...@@ -69,7 +69,7 @@ static inline void ...@@ -69,7 +69,7 @@ static inline void
swapfunc(char *a, char *b, size_t n, int swaptype) swapfunc(char *a, char *b, size_t n, int swaptype)
{ {
if (swaptype <= 1) if (swaptype <= 1)
swapcode(long, a, b, n) swapcode(long, a, b, n)
else else
swapcode(char, a, b, n) swapcode(char, a, b, n)
...@@ -160,9 +160,9 @@ loop: SWAPINIT(a, es); ...@@ -160,9 +160,9 @@ loop: SWAPINIT(a, es);
(lrange > _r && rrange > _r))) (lrange > _r && rrange > _r)))
_pqsort(a, r / es, es, cmp, lrange, rrange); _pqsort(a, r / es, es, cmp, lrange, rrange);
} }
if ((r = pd - pc) > es) { if ((r = pd - pc) > es) {
void *_l, *_r; void *_l, *_r;
/* Iterate rather than recurse to save stack space */ /* Iterate rather than recurse to save stack space */
a = pn - r; a = pn - r;
n = r / es; n = r / es;
......
...@@ -671,7 +671,7 @@ int rdbSave(char *filename) { ...@@ -671,7 +671,7 @@ int rdbSave(char *filename) {
sds keystr = dictGetKey(de); sds keystr = dictGetKey(de);
robj key, *o = dictGetVal(de); robj key, *o = dictGetVal(de);
long long expire; long long expire;
initStaticStringObject(key,keystr); initStaticStringObject(key,keystr);
expire = getExpire(db,&key); expire = getExpire(db,&key);
if (rdbSaveKeyValuePair(&rdb,&key,o,expire,now) == -1) goto werr; if (rdbSaveKeyValuePair(&rdb,&key,o,expire,now) == -1) goto werr;
......
...@@ -143,7 +143,7 @@ static char types[256][16]; ...@@ -143,7 +143,7 @@ static char types[256][16];
/* Return true if 't' is a valid object type. */ /* Return true if 't' is a valid object type. */
int checkType(unsigned char t) { int checkType(unsigned char t) {
/* In case a new object type is added, update the following /* In case a new object type is added, update the following
* condition as necessary. */ * condition as necessary. */
return return
(t >= REDIS_HASH_ZIPMAP && t <= REDIS_HASH_ZIPLIST) || (t >= REDIS_HASH_ZIPMAP && t <= REDIS_HASH_ZIPLIST) ||
...@@ -514,7 +514,7 @@ entry loadEntry() { ...@@ -514,7 +514,7 @@ entry loadEntry() {
return e; return e;
} else { } else {
/* optionally consume expire */ /* optionally consume expire */
if (e.type == REDIS_EXPIRETIME || if (e.type == REDIS_EXPIRETIME ||
e.type == REDIS_EXPIRETIME_MS) { e.type == REDIS_EXPIRETIME_MS) {
if (!processTime(e.type)) return e; if (!processTime(e.type)) return e;
if (!loadType(&e)) return e; if (!loadType(&e)) return e;
......
...@@ -1149,7 +1149,7 @@ static void getRDB(void) { ...@@ -1149,7 +1149,7 @@ static void getRDB(void) {
while(payload) { while(payload) {
ssize_t nread, nwritten; ssize_t nread, nwritten;
nread = read(s,buf,(payload > sizeof(buf)) ? sizeof(buf) : payload); nread = read(s,buf,(payload > sizeof(buf)) ? sizeof(buf) : payload);
if (nread <= 0) { if (nread <= 0) {
fprintf(stderr,"I/O Error reading RDB payload from socket\n"); fprintf(stderr,"I/O Error reading RDB payload from socket\n");
...@@ -1232,7 +1232,7 @@ static void pipeMode(void) { ...@@ -1232,7 +1232,7 @@ static void pipeMode(void) {
errors++; errors++;
} else if (eof && reply->type == REDIS_REPLY_STRING && } else if (eof && reply->type == REDIS_REPLY_STRING &&
reply->len == 20) { reply->len == 20) {
/* Check if this is the reply to our final ECHO /* Check if this is the reply to our final ECHO
* command. If so everything was received * command. If so everything was received
* from the server. */ * from the server. */
if (memcmp(reply->str,magic,20) == 0) { if (memcmp(reply->str,magic,20) == 0) {
...@@ -1253,7 +1253,7 @@ static void pipeMode(void) { ...@@ -1253,7 +1253,7 @@ static void pipeMode(void) {
/* Transfer current buffer to server. */ /* Transfer current buffer to server. */
if (obuf_len != 0) { if (obuf_len != 0) {
ssize_t nwritten = write(fd,obuf+obuf_pos,obuf_len); ssize_t nwritten = write(fd,obuf+obuf_pos,obuf_len);
if (nwritten == -1) { if (nwritten == -1) {
if (errno != EAGAIN && errno != EINTR) { if (errno != EAGAIN && errno != EINTR) {
fprintf(stderr, "Error writing to the server: %s\n", fprintf(stderr, "Error writing to the server: %s\n",
...@@ -1356,7 +1356,7 @@ static redisReply *sendScan(unsigned long long *it) { ...@@ -1356,7 +1356,7 @@ static redisReply *sendScan(unsigned long long *it) {
/* Validate our types are correct */ /* Validate our types are correct */
assert(reply->element[0]->type == REDIS_REPLY_STRING); assert(reply->element[0]->type == REDIS_REPLY_STRING);
assert(reply->element[1]->type == REDIS_REPLY_ARRAY); assert(reply->element[1]->type == REDIS_REPLY_ARRAY);
/* Update iterator */ /* Update iterator */
*it = atoi(reply->element[0]->str); *it = atoi(reply->element[0]->str);
...@@ -1368,7 +1368,7 @@ static int getDbSize(void) { ...@@ -1368,7 +1368,7 @@ static int getDbSize(void) {
int size; int size;
reply = redisCommand(context, "DBSIZE"); reply = redisCommand(context, "DBSIZE");
if(reply == NULL || reply->type != REDIS_REPLY_INTEGER) { if(reply == NULL || reply->type != REDIS_REPLY_INTEGER) {
fprintf(stderr, "Couldn't determine DBSIZE!\n"); fprintf(stderr, "Couldn't determine DBSIZE!\n");
exit(1); exit(1);
...@@ -1421,13 +1421,13 @@ static void getKeyTypes(redisReply *keys, int *types) { ...@@ -1421,13 +1421,13 @@ static void getKeyTypes(redisReply *keys, int *types) {
exit(1); exit(1);
} }
types[i] = toIntType(keys->element[i]->str, reply->str); types[i] = toIntType(keys->element[i]->str, reply->str);
freeReplyObject(reply); freeReplyObject(reply);
} }
} }
static void getKeySizes(redisReply *keys, int *types, static void getKeySizes(redisReply *keys, int *types,
unsigned long long *sizes) unsigned long long *sizes)
{ {
redisReply *reply; redisReply *reply;
char *sizecmds[] = {"STRLEN","LLEN","SCARD","HLEN","ZCARD"}; char *sizecmds[] = {"STRLEN","LLEN","SCARD","HLEN","ZCARD"};
...@@ -1436,10 +1436,10 @@ static void getKeySizes(redisReply *keys, int *types, ...@@ -1436,10 +1436,10 @@ static void getKeySizes(redisReply *keys, int *types,
/* Pipeline size commands */ /* Pipeline size commands */
for(i=0;i<keys->elements;i++) { for(i=0;i<keys->elements;i++) {
/* Skip keys that were deleted */ /* Skip keys that were deleted */
if(types[i]==TYPE_NONE) if(types[i]==TYPE_NONE)
continue; continue;
redisAppendCommand(context, "%s %s", sizecmds[types[i]], redisAppendCommand(context, "%s %s", sizecmds[types[i]],
keys->element[i]->str); keys->element[i]->str);
} }
...@@ -1459,14 +1459,14 @@ static void getKeySizes(redisReply *keys, int *types, ...@@ -1459,14 +1459,14 @@ static void getKeySizes(redisReply *keys, int *types,
} else if(reply->type != REDIS_REPLY_INTEGER) { } else if(reply->type != REDIS_REPLY_INTEGER) {
/* Theoretically the key could have been removed and /* Theoretically the key could have been removed and
* added as a different type between TYPE and SIZE */ * added as a different type between TYPE and SIZE */
fprintf(stderr, fprintf(stderr,
"Warning: %s on '%s' failed (may have changed type)\n", "Warning: %s on '%s' failed (may have changed type)\n",
sizecmds[types[i]], keys->element[i]->str); sizecmds[types[i]], keys->element[i]->str);
sizes[i] = 0; sizes[i] = 0;
} else { } else {
sizes[i] = reply->integer; sizes[i] = reply->integer;
} }
freeReplyObject(reply); freeReplyObject(reply);
} }
} }
...@@ -1523,12 +1523,12 @@ static void findBigKeys(void) { ...@@ -1523,12 +1523,12 @@ static void findBigKeys(void) {
/* Retreive types and then sizes */ /* Retreive types and then sizes */
getKeyTypes(keys, types); getKeyTypes(keys, types);
getKeySizes(keys, types, sizes); getKeySizes(keys, types, sizes);
/* Now update our stats */ /* Now update our stats */
for(i=0;i<keys->elements;i++) { for(i=0;i<keys->elements;i++) {
if((type = types[i]) == TYPE_NONE) if((type = types[i]) == TYPE_NONE)
continue; continue;
totalsize[type] += sizes[i]; totalsize[type] += sizes[i];
counts[type]++; counts[type]++;
totlen += keys->element[i]->len; totlen += keys->element[i]->len;
...@@ -1548,7 +1548,7 @@ static void findBigKeys(void) { ...@@ -1548,7 +1548,7 @@ static void findBigKeys(void) {
} }
/* Keep track of the biggest size for this type */ /* Keep track of the biggest size for this type */
biggest[type] = sizes[i]; biggest[type] = sizes[i];
} }
/* Update overall progress */ /* Update overall progress */
...@@ -1561,7 +1561,7 @@ static void findBigKeys(void) { ...@@ -1561,7 +1561,7 @@ static void findBigKeys(void) {
if(sampled && (sampled %100) == 0 && config.interval) { if(sampled && (sampled %100) == 0 && config.interval) {
usleep(config.interval); usleep(config.interval);
} }
freeReplyObject(reply); freeReplyObject(reply);
} while(it != 0); } while(it != 0);
......
...@@ -1085,7 +1085,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) { ...@@ -1085,7 +1085,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) { if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) {
int exitcode = WEXITSTATUS(statloc); int exitcode = WEXITSTATUS(statloc);
int bysignal = 0; int bysignal = 0;
if (WIFSIGNALED(statloc)) bysignal = WTERMSIG(statloc); if (WIFSIGNALED(statloc)) bysignal = WTERMSIG(statloc);
if (pid == server.rdb_child_pid) { if (pid == server.rdb_child_pid) {
...@@ -1421,7 +1421,7 @@ void initServerConfig() { ...@@ -1421,7 +1421,7 @@ void initServerConfig() {
server.lpushCommand = lookupCommandByCString("lpush"); server.lpushCommand = lookupCommandByCString("lpush");
server.lpopCommand = lookupCommandByCString("lpop"); server.lpopCommand = lookupCommandByCString("lpop");
server.rpopCommand = lookupCommandByCString("rpop"); server.rpopCommand = lookupCommandByCString("rpop");
/* Slow log */ /* Slow log */
server.slowlog_log_slower_than = REDIS_SLOWLOG_LOG_SLOWER_THAN; server.slowlog_log_slower_than = REDIS_SLOWLOG_LOG_SLOWER_THAN;
server.slowlog_max_len = REDIS_SLOWLOG_MAX_LEN; server.slowlog_max_len = REDIS_SLOWLOG_MAX_LEN;
...@@ -2315,7 +2315,7 @@ sds genRedisInfoString(char *section) { ...@@ -2315,7 +2315,7 @@ sds genRedisInfoString(char *section) {
if (server.sentinel_mode) mode = "sentinel"; if (server.sentinel_mode) mode = "sentinel";
else mode = "standalone"; else mode = "standalone";
if (sections++) info = sdscat(info,"\r\n"); if (sections++) info = sdscat(info,"\r\n");
if (call_uname) { if (call_uname) {
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
/* Static server configuration */ /* Static server configuration */
#define REDIS_DEFAULT_HZ 10 /* Time interrupt calls/sec. */ #define REDIS_DEFAULT_HZ 10 /* Time interrupt calls/sec. */
#define REDIS_MIN_HZ 1 #define REDIS_MIN_HZ 1
#define REDIS_MAX_HZ 500 #define REDIS_MAX_HZ 500
#define REDIS_SERVERPORT 6379 /* TCP port */ #define REDIS_SERVERPORT 6379 /* TCP port */
#define REDIS_TCP_BACKLOG 511 /* TCP listen backlog */ #define REDIS_TCP_BACKLOG 511 /* TCP listen backlog */
#define REDIS_MAXIDLETIME 0 /* default client timeout: infinite */ #define REDIS_MAXIDLETIME 0 /* default client timeout: infinite */
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
/* Every time the Redis Git SHA1 or Dirty status changes only this small /* Every time the Redis Git SHA1 or Dirty status changes only this small
* file is recompiled, as we access this information in all the other * file is recompiled, as we access this information in all the other
* files using this functions. */ * files using this functions. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment