From 73e882526621fb0a891b565a5f6eca72d365d818 Mon Sep 17 00:00:00 2001
From: VivekSainiEQ <vivek@eqalpha.com>
Date: Tue, 12 Jan 2021 23:22:36 +0000
Subject: [PATCH] Now post entire timer installation process as one function to
 make atomic with respect to global locks

Former-commit-id: 53936661c88bd7eac88308afc75c510134a8e044
---
 src/module.cpp | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/module.cpp b/src/module.cpp
index 0430124de..a86241c43 100644
--- a/src/module.cpp
+++ b/src/module.cpp
@@ -5668,30 +5668,32 @@ RedisModuleTimerID RM_CreateTimer(RedisModuleCtx *ctx, mstime_t period, RedisMod
         }
     }
 
-    /* We need to install the main event loop timer if it's not already
-     * installed, or we may need to refresh its period if we just installed
-     * a timer that will expire sooner than any other else (i.e. the timer
-     * we just installed is the first timer in the Timers rax). */
-    if (aeTimer != -1) {
-        raxIterator ri;
-        raxStart(&ri,Timers);
-        raxSeek(&ri,"^",NULL,0);
-        raxNext(&ri);
-        if (memcmp(ri.key,&key,sizeof(key)) == 0) {
-            /* This is the first key, we need to re-install the timer according
-             * to the just added event. */
-            aePostFunction(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el, [period]{
+    aePostFunction(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el, [period, key]{
+        /* We need to install the main event loop timer if it's not already
+         * installed, or we may need to refresh its period if we just installed
+         * a timer that will expire sooner than any other else (i.e. the timer
+         * we just installed is the first timer in the Timers rax). */
+        if (aeTimer != -1) {
+            raxIterator ri;
+            raxStart(&ri,Timers);
+            raxSeek(&ri,"^",NULL,0);
+            raxNext(&ri);
+            if (memcmp(ri.key,&key,sizeof(key)) == 0) {
+                /* This is the first key, we need to re-install the timer according
+                * to the just added event. */
                 aeDeleteTimeEvent(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el,aeTimer);
-                aeTimer = aeCreateTimeEvent(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el,period,moduleTimerHandler,NULL,NULL);
-            });
+                aeTimer = -1;
+            }
+            raxStop(&ri);
         }
-        raxStop(&ri);
-    } else {    
-        /* If we have no main timer because this is the first module timer we have, install one. */
-        aePostFunction(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el, [period]{
+
+        /* If we have no main timer (the old one was invalidated, or this is the
+        * first module timer we have), install one. */
+        if (aeTimer == -1) {
             aeTimer = aeCreateTimeEvent(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el,period,moduleTimerHandler,NULL,NULL);
-        });
-    }
+        }
+    });
+
 
     return key;
 }