zeekling/hiredis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Run pending callbacks with NULL reply on redisDisconnect()

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-10-19 21:16:57 +02:00
parent bbe007a75a
commit 0f745d1ac0
4 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hiredis.c
View File

@ -587,6 +587,21 @@ static redisContext *redisContextInit(redisReplyFunctions *fn) {
}
void redisDisconnect(redisContext *c) {
int i;
redisCallback cb;
/* Non-blocking context: call pending callbacks with the NULL reply */
if (!(c->flags & REDIS_BLOCK)) {
for (i = 0; i < c->cpos; i++) {
cb = c->callbacks[i];
if (cb.fn != NULL) {
cb.fn(c,NULL,cb.privdata);
}
}
/* Reset callback index */
c->cpos = 0;
}
if (c->cbDisconnect.fn != NULL)
c->cbDisconnect.fn(c,c->cbDisconnect.privdata);
close(c->fd);

1
libev-example.c
View File

@ -5,6 +5,7 @@
#include <signal.h>
void getCallback(redisContext *c, redisReply *reply, void *privdata) {
if (reply == NULL) return; /* Error */
printf("argv[%s]: %s\n", (char*)privdata, reply->reply);
/* Disconnect after receiving the reply to GET */

1
libevent-example.c
View File

@ -5,6 +5,7 @@
#include <signal.h>
void getCallback(redisContext *c, redisReply *reply, void *privdata) {
if (reply == NULL) return; /* Error */
printf("argv[%s]: %s\n", (const char*)privdata, reply->reply);
/* Disconnect after receiving the reply to GET */

21
test.c
View File

@ -202,18 +202,17 @@ static void __test_callback(redisContext *c, void *privdata) {
__test_callback_flags |= (long)privdata;
}
static long __test_reply_callback_flags = 0;
static void __test_reply_callback(redisContext *c, redisReply *reply, void *privdata) {
((void)c);
/* Shift to detect execution order */
__test_reply_callback_flags <<= 8;
__test_reply_callback_flags |= (long)privdata;
freeReplyObject(reply);
__test_callback_flags <<= 8;
__test_callback_flags |= (long)privdata;
if (reply) freeReplyObject(reply);
}
static redisContext *__connect_nonblock() {
/* Reset callback flags */
__test_callback_flags = __test_reply_callback_flags = 0;
__test_callback_flags = 0;
return redisConnectNonBlock("127.0.0.1", 6379, NULL);
}
@ -278,11 +277,19 @@ static void test_nonblocking_connection() {
/* Read until at least one callback is executed (the 3 replies will
* arrive in a single packet, causing all callbacks to be executed in
* a single pass). */
while(__test_reply_callback_flags == 0) {
while(__test_callback_flags == 0) {
assert(redisBufferRead(c) == REDIS_OK);
redisProcessCallbacks(c);
}
test_cond(__test_reply_callback_flags == 0x010203);
test_cond(__test_callback_flags == 0x010203);
redisFree(c);
test("redisDisconnect executes pending callbacks with NULL reply: ");
c = __connect_nonblock();
redisSetDisconnectCallback(c,__test_callback,(void*)1);
redisCommandWithCallback(c,__test_reply_callback,(void*)2,"PING");
redisDisconnect(c);
test_cond(__test_callback_flags == 0x0201);
redisFree(c);
}