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

Clean up dictionaries on free

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-12-31 14:35:01 +01:00
parent a0ebc5417f
commit ed97945c27
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
async.c
View File

@ -197,19 +197,42 @@ static int __redisShiftCallback(redisCallbackList *list, redisCallback *target)
return REDIS_ERR; return REDIS_ERR;
} }
static void __redisRunCallback(redisAsyncContext *ac, redisCallback *cb, redisReply *reply) {
redisContext *c = &(ac->c);
if (cb->fn != NULL) {
c->flags |= REDIS_IN_CALLBACK;
cb->fn(ac,reply,cb->privdata);
c->flags &= ~REDIS_IN_CALLBACK;
}
}
/* Helper function to free the context. */ /* Helper function to free the context. */
static void __redisAsyncFree(redisAsyncContext *ac) { static void __redisAsyncFree(redisAsyncContext *ac) {
redisContext *c = &(ac->c); redisContext *c = &(ac->c);
redisCallback cb; redisCallback cb;
dictIterator *it;
dictEntry *de;
/* Execute pending callbacks with NULL reply. */ /* Execute pending callbacks with NULL reply. */
while (__redisShiftCallback(&ac->replies,&cb) == REDIS_OK) { while (__redisShiftCallback(&ac->replies,&cb) == REDIS_OK)
if (cb.fn != NULL) { __redisRunCallback(ac,&cb,NULL);
c->flags |= REDIS_IN_CALLBACK;
cb.fn(ac,NULL,cb.privdata); /* Execute callbacks for invalid commands */
c->flags &= ~REDIS_IN_CALLBACK; while (__redisShiftCallback(&ac->sub.invalid,&cb) == REDIS_OK)
} __redisRunCallback(ac,&cb,NULL);
}
/* Run subscription callbacks callbacks with NULL reply */
it = dictGetIterator(ac->sub.channels);
while ((de = dictNext(it)) != NULL)
__redisRunCallback(ac,dictGetEntryVal(de),NULL);
dictReleaseIterator(it);
dictRelease(ac->sub.channels);
it = dictGetIterator(ac->sub.patterns);
while ((de = dictNext(it)) != NULL)
__redisRunCallback(ac,dictGetEntryVal(de),NULL);
dictReleaseIterator(it);
dictRelease(ac->sub.patterns);
/* Signal event lib to clean up */ /* Signal event lib to clean up */
if (ac->ev.cleanup) ac->ev.cleanup(ac->ev.data); if (ac->ev.cleanup) ac->ev.cleanup(ac->ev.data);
@ -349,9 +372,7 @@ void redisProcessCallbacks(redisAsyncContext *ac) {
} }
if (cb.fn != NULL) { if (cb.fn != NULL) {
c->flags |= REDIS_IN_CALLBACK; __redisRunCallback(ac,&cb,reply);
cb.fn(ac,reply,cb.privdata);
c->flags &= ~REDIS_IN_CALLBACK;
c->fn->freeObject(reply); c->fn->freeObject(reply);
/* Proceed with free'ing when redisAsyncFree() was called. */ /* Proceed with free'ing when redisAsyncFree() was called. */