caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 08:38:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modules: rename the reused static client to something more general.

Browse Source
This commit is contained in:
antirez 2018-09-18 13:22:05 +02:00
parent 9df1f73e4c
commit 7cdf272d46
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/module.c
View File

@ -241,9 +241,11 @@ typedef struct RedisModuleKeyspaceSubscriber {
/* The module keyspace notification subscribers list */ /* The module keyspace notification subscribers list */
static list *moduleKeyspaceSubscribers; static list *moduleKeyspaceSubscribers;
/* Static client recycled for all notification clients, to avoid allocating /* Static client recycled for when we need to provide a context with a client
* per round. */ * in a situation where there is no client to provide. This avoidsallocating
static client *moduleKeyspaceSubscribersClient; * a new client per round. For instance this is used in the keyspace
* notifications, timers and cluster messages callbacks. */
static client *moduleFreeContextReusedClient;
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
* Prototypes * Prototypes
@ -3875,7 +3877,7 @@ void moduleNotifyKeyspaceEvent(int type, const char *event, robj *key, int dbid)
if ((sub->event_mask & type) && sub->active == 0) { if ((sub->event_mask & type) && sub->active == 0) {
RedisModuleCtx ctx = REDISMODULE_CTX_INIT; RedisModuleCtx ctx = REDISMODULE_CTX_INIT;
ctx.module = sub->module; ctx.module = sub->module;
ctx.client = moduleKeyspaceSubscribersClient; ctx.client = moduleFreeContextReusedClient;
selectDb(ctx.client, dbid); selectDb(ctx.client, dbid);
/* mark the handler as active to avoid reentrant loops. /* mark the handler as active to avoid reentrant loops.
@ -3938,7 +3940,7 @@ void moduleCallClusterReceivers(const char *sender_id, uint64_t module_id, uint8
if (r->module_id == module_id) { if (r->module_id == module_id) {
RedisModuleCtx ctx = REDISMODULE_CTX_INIT; RedisModuleCtx ctx = REDISMODULE_CTX_INIT;
ctx.module = r->module; ctx.module = r->module;
ctx.client = moduleKeyspaceSubscribersClient; ctx.client = moduleFreeContextReusedClient;
selectDb(ctx.client, 0); selectDb(ctx.client, 0);
r->callback(&ctx,sender_id,type,payload,len); r->callback(&ctx,sender_id,type,payload,len);
moduleFreeContext(&ctx); moduleFreeContext(&ctx);
@ -4184,7 +4186,7 @@ int moduleTimerHandler(struct aeEventLoop *eventLoop, long long id, void *client
RedisModuleCtx ctx = REDISMODULE_CTX_INIT; RedisModuleCtx ctx = REDISMODULE_CTX_INIT;
ctx.module = timer->module; ctx.module = timer->module;
ctx.client = moduleKeyspaceSubscribersClient; ctx.client = moduleFreeContextReusedClient;
selectDb(ctx.client, 0); selectDb(ctx.client, 0);
timer->callback(&ctx,timer->data); timer->callback(&ctx,timer->data);
moduleFreeContext(&ctx); moduleFreeContext(&ctx);
@ -4342,8 +4344,8 @@ void moduleInitModulesSystem(void) {
/* Set up the keyspace notification susbscriber list and static client */ /* Set up the keyspace notification susbscriber list and static client */
moduleKeyspaceSubscribers = listCreate(); moduleKeyspaceSubscribers = listCreate();
moduleKeyspaceSubscribersClient = createClient(-1); moduleFreeContextReusedClient = createClient(-1);
moduleKeyspaceSubscribersClient->flags |= CLIENT_MODULE; moduleFreeContextReusedClient->flags |= CLIENT_MODULE;
moduleRegisterCoreAPI(); moduleRegisterCoreAPI();
if (pipe(server.module_blocked_pipe) == -1) { if (pipe(server.module_blocked_pipe) == -1) {