]> git.saurik.com Git - redis.git/commitdiff
converted a few calls to assert() => redisAssert() to print stack trace
authorantirez <antirez@gmail.com>
Wed, 6 Jan 2010 00:44:22 +0000 (19:44 -0500)
committerantirez <antirez@gmail.com>
Wed, 6 Jan 2010 00:44:22 +0000 (19:44 -0500)
redis.c

diff --git a/redis.c b/redis.c
index d8243b6b67c4924bc91511d02faab9f158d2e1bf..e427ab603bf3abf7173b7b09ca6db341a4b4e806 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -2360,7 +2360,7 @@ static void freeHashObject(robj *o) {
 }
 
 static void incrRefCount(robj *o) {
-    assert(!server.vm_enabled || o->storage == REDIS_VM_MEMORY);
+    redisAssert(!server.vm_enabled || o->storage == REDIS_VM_MEMORY);
     o->refcount++;
 }
 
@@ -2369,8 +2369,8 @@ static void decrRefCount(void *obj) {
 
     /* REDIS_VM_SWAPPED */
     if (server.vm_enabled && o->storage == REDIS_VM_SWAPPED) {
-        assert(o->refcount == 1);
-        assert(o->type == REDIS_STRING);
+        redisAssert(o->refcount == 1);
+        redisAssert(o->type == REDIS_STRING);
         freeStringObject(o);
         vmMarkPagesFree(o->vm.page,o->vm.usedpages);
         if (listLength(server.objfreelist) > REDIS_OBJFREELIST_MAX ||
@@ -2406,7 +2406,7 @@ static robj *lookupKey(redisDb *db, robj *key) {
                 key->vm.atime = server.unixtime;
             } else {
                 /* Our value was swapped on disk. Bring it at home. */
-                assert(val == NULL);
+                redisAssert(val == NULL);
                 val = vmLoadObject(key);
                 dictGetEntryVal(de) = val;
             }