fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-04 16:51:12 +00:00
Code Issues Projects Releases Wiki Activity

fixed a problem with BLPOP timeout of zero, now it blocks forever

Browse Source
This commit is contained in:
antirez 2009-12-29 19:11:05 -05:00
parent f86a74e944
commit 58d976b8e8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redis.c
View File

@ -901,7 +901,7 @@ static void closeTimedoutClients(void) {
redisLog(REDIS_DEBUG,"Closing idle client"); redisLog(REDIS_DEBUG,"Closing idle client");
freeClient(c); freeClient(c);
} else if (c->flags & REDIS_BLOCKED) { } else if (c->flags & REDIS_BLOCKED) {
if (c->blockingto < now) { if (c->blockingto != 0 && c->blockingto < now) {
addReply(c,shared.nullbulk); addReply(c,shared.nullbulk);
unblockClient(c); unblockClient(c);
} }
@ -5503,6 +5503,7 @@ static void blockForKey(redisClient *c, robj *key, time_t timeout) {
if (de == NULL) { if (de == NULL) {
int retval; int retval;
/* We take a list of clients blocked for a given key */
l = listCreate(); l = listCreate();
retval = dictAdd(c->db->blockingkeys,key,l); retval = dictAdd(c->db->blockingkeys,key,l);
incrRefCount(key); incrRefCount(key);
@ -5510,6 +5511,7 @@ static void blockForKey(redisClient *c, robj *key, time_t timeout) {
} else { } else {
l = dictGetEntryVal(de); l = dictGetEntryVal(de);
} }
/* Add this client to the list, and mark it as blocked */
listAddNodeTail(l,c); listAddNodeTail(l,c);
c->flags |= REDIS_BLOCKED; c->flags |= REDIS_BLOCKED;
aeDeleteFileEvent(server.el,c->fd,AE_READABLE); aeDeleteFileEvent(server.el,c->fd,AE_READABLE);