gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issued #85 (getDecodedObject: Assertion 1 != 1 failed. While sorting a set), added a smarter assert() function to dump the stacktrace, provided a macro to initalize Redis objects on the stack to avoid this kind of bugs.

Browse Source
This commit is contained in:
antirez 2009-11-30 20:25:06 +01:00
parent e17e0b0529
commit dfc5e96ce5
2 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
redis.c
View File

@ -198,6 +198,10 @@
#define APPENDFSYNC_ALWAYS 1 #define APPENDFSYNC_ALWAYS 1
#define APPENDFSYNC_EVERYSEC 2 #define APPENDFSYNC_EVERYSEC 2
/* We can print the stacktrace, so our assert is defined this way: */
#define redisAssert(_e) ((_e)?(void)0 : (_redisAssert(#_e),exit(1)))
static void _redisAssert(char *estr);
/*================================= Data types ============================== */ /*================================= Data types ============================== */
/* A redis object, that is a type able to hold a string / list / set */ /* A redis object, that is a type able to hold a string / list / set */
@ -209,6 +213,17 @@ typedef struct redisObject {
int refcount; int refcount;
} robj; } robj;
/* Macro used to initalize a Redis object allocated on the stack.
* Note that this macro is taken near the structure definition to make sure
* we'll update it when the structure is changed, to avoid bugs like
* bug #85 introduced exactly in this way. */
#define initStaticStringObject(_var,_ptr) do { \
_var.refcount = 1; \
_var.type = REDIS_STRING; \
_var.encoding = REDIS_ENCODING_RAW; \
_var.ptr = _ptr; \
} while(0);
typedef struct redisDb { typedef struct redisDb {
dict *dict; dict *dict;
dict *expires; dict *expires;
@ -1397,14 +1412,14 @@ static void freeClient(redisClient *c) {
freeClientArgv(c); freeClientArgv(c);
close(c->fd); close(c->fd);
ln = listSearchKey(server.clients,c); ln = listSearchKey(server.clients,c);
assert(ln != NULL); redisAssert(ln != NULL);
listDelNode(server.clients,ln); listDelNode(server.clients,ln);
if (c->flags & REDIS_SLAVE) { if (c->flags & REDIS_SLAVE) {
if (c->replstate == REDIS_REPL_SEND_BULK && c->repldbfd != -1) if (c->replstate == REDIS_REPL_SEND_BULK && c->repldbfd != -1)
close(c->repldbfd); close(c->repldbfd);
list *l = (c->flags & REDIS_MONITOR) ? server.monitors : server.slaves; list *l = (c->flags & REDIS_MONITOR) ? server.monitors : server.slaves;
ln = listSearchKey(l,c); ln = listSearchKey(l,c);
assert(ln != NULL); redisAssert(ln != NULL);
listDelNode(l,ln); listDelNode(l,ln);
} }
if (c->flags & REDIS_MASTER) { if (c->flags & REDIS_MASTER) {
@ -2155,7 +2170,7 @@ static void decrRefCount(void *obj) {
case REDIS_SET: freeSetObject(o); break; case REDIS_SET: freeSetObject(o); break;
case REDIS_ZSET: freeZsetObject(o); break; case REDIS_ZSET: freeZsetObject(o); break;
case REDIS_HASH: freeHashObject(o); break; case REDIS_HASH: freeHashObject(o); break;
default: assert(0 != 0); break; default: redisAssert(0 != 0); break;
} }
if (listLength(server.objfreelist) > REDIS_OBJFREELIST_MAX || if (listLength(server.objfreelist) > REDIS_OBJFREELIST_MAX ||
!listAddNodeHead(server.objfreelist,o)) !listAddNodeHead(server.objfreelist,o))
@ -2200,7 +2215,7 @@ static robj *tryObjectSharing(robj *o) {
if (o == NULL || server.shareobjects == 0) return o; if (o == NULL || server.shareobjects == 0) return o;
assert(o->type == REDIS_STRING); redisAssert(o->type == REDIS_STRING);
de = dictFind(server.sharingpool,o); de = dictFind(server.sharingpool,o);
if (de) { if (de) {
robj *shared = dictGetEntryKey(de); robj *shared = dictGetEntryKey(de);
@ -2218,7 +2233,7 @@ static robj *tryObjectSharing(robj *o) {
if (dictSize(server.sharingpool) >= if (dictSize(server.sharingpool) >=
server.sharingpoolsize) { server.sharingpoolsize) {
de = dictGetRandomKey(server.sharingpool); de = dictGetRandomKey(server.sharingpool);
assert(de != NULL); redisAssert(de != NULL);
c = ((unsigned long) dictGetEntryVal(de))-1; c = ((unsigned long) dictGetEntryVal(de))-1;
dictGetEntryVal(de) = (void*) c; dictGetEntryVal(de) = (void*) c;
if (c == 0) { if (c == 0) {
@ -2231,7 +2246,7 @@ static robj *tryObjectSharing(robj *o) {
int retval; int retval;
retval = dictAdd(server.sharingpool,o,(void*)1); retval = dictAdd(server.sharingpool,o,(void*)1);
assert(retval == DICT_OK); redisAssert(retval == DICT_OK);
incrRefCount(o); incrRefCount(o);
} }
return o; return o;
@ -2274,7 +2289,7 @@ static int tryObjectEncoding(robj *o) {
if (o->refcount > 1) return REDIS_ERR; if (o->refcount > 1) return REDIS_ERR;
/* Currently we try to encode only strings */ /* Currently we try to encode only strings */
assert(o->type == REDIS_STRING); redisAssert(o->type == REDIS_STRING);
/* Check if we can represent this string as a long integer */ /* Check if we can represent this string as a long integer */
if (isStringRepresentableAsLong(s,&value) == REDIS_ERR) return REDIS_ERR; if (isStringRepresentableAsLong(s,&value) == REDIS_ERR) return REDIS_ERR;
@ -2302,7 +2317,7 @@ static robj *getDecodedObject(robj *o) {
dec = createStringObject(buf,strlen(buf)); dec = createStringObject(buf,strlen(buf));
return dec; return dec;
} else { } else {
assert(1 != 1); redisAssert(1 != 1);
} }
} }
@ -2315,7 +2330,7 @@ static robj *getDecodedObject(robj *o) {
* sdscmp() from sds.c will apply memcmp() so this function ca be considered * sdscmp() from sds.c will apply memcmp() so this function ca be considered
* binary safe. */ * binary safe. */
static int compareStringObjects(robj *a, robj *b) { static int compareStringObjects(robj *a, robj *b) {
assert(a->type == REDIS_STRING && b->type == REDIS_STRING); redisAssert(a->type == REDIS_STRING && b->type == REDIS_STRING);
char bufa[128], bufb[128], *astr, *bstr; char bufa[128], bufb[128], *astr, *bstr;
int bothsds = 1; int bothsds = 1;
@ -2338,7 +2353,7 @@ static int compareStringObjects(robj *a, robj *b) {
} }
static size_t stringObjectLen(robj *o) { static size_t stringObjectLen(robj *o) {
assert(o->type == REDIS_STRING); redisAssert(o->type == REDIS_STRING);
if (o->encoding == REDIS_ENCODING_RAW) { if (o->encoding == REDIS_ENCODING_RAW) {
return sdslen(o->ptr); return sdslen(o->ptr);
} else { } else {
@ -2611,7 +2626,7 @@ static int rdbSave(char *filename) {
} }
dictReleaseIterator(di); dictReleaseIterator(di);
} else { } else {
assert(0 != 0); redisAssert(0 != 0);
} }
} }
dictReleaseIterator(di); dictReleaseIterator(di);
@ -2745,7 +2760,7 @@ static robj *rdbLoadIntegerObject(FILE *fp, int enctype) {
val = (int32_t)v; val = (int32_t)v;
} else { } else {
val = 0; /* anti-warning */ val = 0; /* anti-warning */
assert(0!=0); redisAssert(0!=0);
} }
return createObject(REDIS_STRING,sdscatprintf(sdsempty(),"%lld",val)); return createObject(REDIS_STRING,sdscatprintf(sdsempty(),"%lld",val));
} }
@ -2784,7 +2799,7 @@ static robj *rdbLoadStringObject(FILE*fp, int rdbver) {
case REDIS_RDB_ENC_LZF: case REDIS_RDB_ENC_LZF:
return tryObjectSharing(rdbLoadLzfStringObject(fp,rdbver)); return tryObjectSharing(rdbLoadLzfStringObject(fp,rdbver));
default: default:
assert(0!=0); redisAssert(0!=0);
} }
} }
@ -2910,7 +2925,7 @@ static int rdbLoad(char *filename) {
incrRefCount(ele); /* added to skiplist */ incrRefCount(ele); /* added to skiplist */
} }
} else { } else {
assert(0 != 0); redisAssert(0 != 0);
} }
/* Add the new object in the hash table */ /* Add the new object in the hash table */
retval = dictAdd(d,keyobj,o); retval = dictAdd(d,keyobj,o);
@ -3101,7 +3116,7 @@ static void incrDecrCommand(redisClient *c, long long incr) {
else if (o->encoding == REDIS_ENCODING_INT) else if (o->encoding == REDIS_ENCODING_INT)
value = (long)o->ptr; value = (long)o->ptr;
else else
assert(1 != 1); redisAssert(1 != 1);
} }
} }
@ -4393,14 +4408,14 @@ static void zaddGenericCommand(redisClient *c, robj *key, robj *ele, double scor
/* case 2: Score update operation */ /* case 2: Score update operation */
de = dictFind(zs->dict,ele); de = dictFind(zs->dict,ele);
assert(de != NULL); redisAssert(de != NULL);
oldscore = dictGetEntryVal(de); oldscore = dictGetEntryVal(de);
if (*score != *oldscore) { if (*score != *oldscore) {
int deleted; int deleted;
/* Remove and insert the element in the skip list with new score */ /* Remove and insert the element in the skip list with new score */
deleted = zslDelete(zs->zsl,*oldscore,ele); deleted = zslDelete(zs->zsl,*oldscore,ele);
assert(deleted != 0); redisAssert(deleted != 0);
zslInsert(zs->zsl,*score,ele); zslInsert(zs->zsl,*score,ele);
incrRefCount(ele); incrRefCount(ele);
/* Update the score in the hash table */ /* Update the score in the hash table */
@ -4455,7 +4470,7 @@ static void zremCommand(redisClient *c) {
/* Delete from the skiplist */ /* Delete from the skiplist */
oldscore = dictGetEntryVal(de); oldscore = dictGetEntryVal(de);
deleted = zslDelete(zs->zsl,*oldscore,c->argv[2]); deleted = zslDelete(zs->zsl,*oldscore,c->argv[2]);
assert(deleted != 0); redisAssert(deleted != 0);
/* Delete from the hash table */ /* Delete from the hash table */
dictDelete(zs->dict,c->argv[2]); dictDelete(zs->dict,c->argv[2]);
@ -4733,10 +4748,7 @@ static robj *lookupKeyByPattern(redisDb *db, robj *pattern, robj *subst) {
keyname.buf[prefixlen+sublen+postfixlen] = '\0'; keyname.buf[prefixlen+sublen+postfixlen] = '\0';
keyname.len = prefixlen+sublen+postfixlen; keyname.len = prefixlen+sublen+postfixlen;
keyobj.refcount = 1; initStaticStringObject(keyobj,((char*)&keyname)+(sizeof(long)*2))
keyobj.type = REDIS_STRING;
keyobj.ptr = ((char*)&keyname)+(sizeof(long)*2);
decrRefCount(subst); decrRefCount(subst);
/* printf("lookup '%s' => %p\n", keyname.buf,de); */ /* printf("lookup '%s' => %p\n", keyname.buf,de); */
@ -4865,7 +4877,7 @@ static void sortCommand(redisClient *c) {
case REDIS_LIST: vectorlen = listLength((list*)sortval->ptr); break; case REDIS_LIST: vectorlen = listLength((list*)sortval->ptr); break;
case REDIS_SET: vectorlen = dictSize((dict*)sortval->ptr); break; case REDIS_SET: vectorlen = dictSize((dict*)sortval->ptr); break;
case REDIS_ZSET: vectorlen = dictSize(((zset*)sortval->ptr)->dict); break; case REDIS_ZSET: vectorlen = dictSize(((zset*)sortval->ptr)->dict); break;
default: vectorlen = 0; assert(0); /* Avoid GCC warning */ default: vectorlen = 0; redisAssert(0); /* Avoid GCC warning */
} }
vector = zmalloc(sizeof(redisSortObject)*vectorlen); vector = zmalloc(sizeof(redisSortObject)*vectorlen);
j = 0; j = 0;
@ -4903,7 +4915,7 @@ static void sortCommand(redisClient *c) {
} }
dictReleaseIterator(di); dictReleaseIterator(di);
} }
assert(j == vectorlen); redisAssert(j == vectorlen);
/* Now it's time to load the right scores in the sorting vector */ /* Now it's time to load the right scores in the sorting vector */
if (dontsort == 0) { if (dontsort == 0) {
@ -4925,7 +4937,7 @@ static void sortCommand(redisClient *c) {
if (byval->encoding == REDIS_ENCODING_INT) { if (byval->encoding == REDIS_ENCODING_INT) {
vector[j].u.score = (long)byval->ptr; vector[j].u.score = (long)byval->ptr;
} else } else
assert(1 != 1); redisAssert(1 != 1);
} }
} }
} else { } else {
@ -4936,7 +4948,7 @@ static void sortCommand(redisClient *c) {
if (vector[j].obj->encoding == REDIS_ENCODING_INT) if (vector[j].obj->encoding == REDIS_ENCODING_INT)
vector[j].u.score = (long) vector[j].obj->ptr; vector[j].u.score = (long) vector[j].obj->ptr;
else else
assert(1 != 1); redisAssert(1 != 1);
} }
} }
} }
@ -4991,7 +5003,7 @@ static void sortCommand(redisClient *c) {
addReply(c,shared.crlf); addReply(c,shared.crlf);
} }
} else { } else {
assert(sop->type == REDIS_SORT_GET); /* always fails */ redisAssert(sop->type == REDIS_SORT_GET); /* always fails */
} }
} }
} }
@ -5020,7 +5032,7 @@ static void sortCommand(redisClient *c) {
incrRefCount(val); incrRefCount(val);
} }
} else { } else {
assert(sop->type == REDIS_SORT_GET); /* always fails */ redisAssert(sop->type == REDIS_SORT_GET); /* always fails */
} }
} }
} }
@ -5966,7 +5978,7 @@ static int rewriteAppendOnlyFile(char *filename) {
} }
dictReleaseIterator(di); dictReleaseIterator(di);
} else { } else {
assert(0 != 0); redisAssert(0 != 0);
} }
/* Save the expire time */ /* Save the expire time */
if (expiretime != -1) { if (expiretime != -1) {
@ -6107,6 +6119,15 @@ static void debugCommand(redisClient *c) {
} }
} }
static void _redisAssert(char *estr) {
redisLog(REDIS_WARNING,"=== ASSERTION FAILED ===");
redisLog(REDIS_WARNING,"==> %s\n",estr);
#ifdef HAVE_BACKTRACE
redisLog(REDIS_WARNING,"(forcing SIGSEGV in order to print the stack trace)");
*((char*)-1) = 'x';
#endif
}
/* =================================== Main! ================================ */ /* =================================== Main! ================================ */
#ifdef __linux__ #ifdef __linux__

2
staticsymbols.h
View File

@ -1,4 +1,5 @@
static struct redisFunctionSym symsTable[] = { static struct redisFunctionSym symsTable[] = {
{"_redisAssert",(unsigned long)_redisAssert},
{"acceptHandler",(unsigned long)acceptHandler}, {"acceptHandler",(unsigned long)acceptHandler},
{"addReply",(unsigned long)addReply}, {"addReply",(unsigned long)addReply},
{"addReplyBulkLen",(unsigned long)addReplyBulkLen}, {"addReplyBulkLen",(unsigned long)addReplyBulkLen},
@ -55,6 +56,7 @@ static struct redisFunctionSym symsTable[] = {
{"fwriteBulk",(unsigned long)fwriteBulk}, {"fwriteBulk",(unsigned long)fwriteBulk},
{"fwriteBulkDouble",(unsigned long)fwriteBulkDouble}, {"fwriteBulkDouble",(unsigned long)fwriteBulkDouble},
{"fwriteBulkLong",(unsigned long)fwriteBulkLong}, {"fwriteBulkLong",(unsigned long)fwriteBulkLong},
{"genRedisInfoString",(unsigned long)genRedisInfoString},
{"getCommand",(unsigned long)getCommand}, {"getCommand",(unsigned long)getCommand},
{"getDecodedObject",(unsigned long)getDecodedObject}, {"getDecodedObject",(unsigned long)getDecodedObject},
{"getExpire",(unsigned long)getExpire}, {"getExpire",(unsigned long)getExpire},