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

Modules: fixes to the blocking commands API: examples now works.

Browse Source
This commit is contained in:
antirez 2016-10-07 16:34:40 +02:00
parent f156038db8
commit 34599691b3
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/module.c
View File

@ -3115,7 +3115,7 @@ RedisModuleBlockedClient *RM_BlockClient(RedisModuleCtx *ctx, RedisModuleCmdFunc
bc->timeout_callback = timeout_callback; bc->timeout_callback = timeout_callback;
bc->free_privdata = free_privdata; bc->free_privdata = free_privdata;
bc->privdata = NULL; bc->privdata = NULL;
c->bpop.timeout = timeout_ms; c->bpop.timeout = timeout_ms ? (mstime()+timeout_ms) : 0;
blockClient(c,BLOCKED_MODULE); blockClient(c,BLOCKED_MODULE);
return bc; return bc;
@ -3157,7 +3157,11 @@ void moduleHandleBlockedClients(void) {
ln = listFirst(moduleUnblockedClients); ln = listFirst(moduleUnblockedClients);
bc = ln->value; bc = ln->value;
client *c = bc->client; client *c = bc->client;
listDelNode(server.unblocked_clients,ln); listDelNode(moduleUnblockedClients,ln);
pthread_mutex_unlock(&moduleUnblockedClientsMutex);
/* Release the lock during the loop, as long as we don't
* touch the shared list. */
if (c != NULL) { if (c != NULL) {
RedisModuleCtx ctx = REDISMODULE_CTX_INIT; RedisModuleCtx ctx = REDISMODULE_CTX_INIT;
@ -3172,6 +3176,10 @@ void moduleHandleBlockedClients(void) {
if (bc->privdata && bc->free_privdata) if (bc->privdata && bc->free_privdata)
bc->free_privdata(bc->privdata); bc->free_privdata(bc->privdata);
zfree(bc); zfree(bc);
if (c != NULL) unblockClient(bc->client);
/* Lock again before to iterate the loop. */
pthread_mutex_lock(&moduleUnblockedClientsMutex);
} }
pthread_mutex_unlock(&moduleUnblockedClientsMutex); pthread_mutex_unlock(&moduleUnblockedClientsMutex);
} }