From 1f78d9b859c26daf5127bae0c790ff83208af38f Mon Sep 17 00:00:00 2001
From: localvar <localvar@hotmail.com>
Date: Mon, 11 Nov 2019 03:28:55 +0000
Subject: [PATCH] make(rollback) max timer controller number to 512 and make it
 configurable.

---
 src/inc/tglobalcfg.h      |  2 ++
 src/inc/ttimer.h          |  2 +-
 src/util/src/tglobalcfg.c |  5 +++++
 src/util/src/ttimer.c     | 21 ++++++++++++++++-----
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/inc/tglobalcfg.h b/src/inc/tglobalcfg.h
index e83c89593f..026d48ba08 100644
--- a/src/inc/tglobalcfg.h
+++ b/src/inc/tglobalcfg.h
@@ -169,6 +169,8 @@ extern uint32_t debugFlag;
 extern uint32_t odbcdebugFlag;
 extern uint32_t qdebugFlag;
 
+extern uint32_t taosMaxTmrCtrl;
+
 extern int  tsRpcTimer;
 extern int  tsRpcMaxTime;
 extern int  tsUdpDelay;
diff --git a/src/inc/ttimer.h b/src/inc/ttimer.h
index 5424881e26..b9bbbb04dd 100644
--- a/src/inc/ttimer.h
+++ b/src/inc/ttimer.h
@@ -25,6 +25,7 @@ typedef void (*TAOS_TMR_CALLBACK)(void *, void *);
 
 extern uint32_t tmrDebugFlag;
 extern int      taosTmrThreads;
+extern uint32_t taosMaxTmrCtrl;
 
 #define tmrError(...)                                 \
   do { if (tmrDebugFlag & DEBUG_ERROR) {              \
@@ -41,7 +42,6 @@ extern int      taosTmrThreads;
     tprintf("TMR ", tmrDebugFlag, __VA_ARGS__); \
   } } while(0)
 
-#define MAX_NUM_OF_TMRCTL 512
 #define MSECONDS_PER_TICK 5
 
 void *taosTmrInit(int maxTmr, int resoultion, int longest, const char *label);
diff --git a/src/util/src/tglobalcfg.c b/src/util/src/tglobalcfg.c
index 9abe60220f..586f329001 100644
--- a/src/util/src/tglobalcfg.c
+++ b/src/util/src/tglobalcfg.c
@@ -536,6 +536,11 @@ void tsInitGlobalConfig() {
                      0, 2, 0, TSDB_CFG_UTYPE_NONE);
   // 0-any, 1-mgmt, 2-dnode
 
+  // timer
+  tsInitConfigOption(cfg++, "maxTmrCtrl", &taosMaxTmrCtrl, TSDB_CFG_VTYPE_INT,
+                    TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLUSTER,
+                    8, 2048, 0, TSDB_CFG_UTYPE_NONE);
+
   // time
   tsInitConfigOption(cfg++, "monitorInterval", &tsMonitorInterval, TSDB_CFG_VTYPE_INT,
                      TSDB_CFG_CTYPE_B_CONFIG,
diff --git a/src/util/src/ttimer.c b/src/util/src/ttimer.c
index 798e63a64a..e6d98a3734 100644
--- a/src/util/src/ttimer.c
+++ b/src/util/src/ttimer.c
@@ -82,13 +82,16 @@ typedef struct time_wheel_t {
 } time_wheel_t;
 
 uint32_t tmrDebugFlag = DEBUG_ERROR | DEBUG_WARN | DEBUG_FILE;
+uint32_t taosMaxTmrCtrl = 512;
 
 static pthread_once_t  tmrModuleInit = PTHREAD_ONCE_INIT;
 static pthread_mutex_t tmrCtrlMutex;
-static tmr_ctrl_t      tmrCtrls[MAX_NUM_OF_TMRCTL];
+static tmr_ctrl_t*     tmrCtrls;
 static tmr_ctrl_t*     unusedTmrCtrl = NULL;
-void*                  tmrQhandle;
-int                    taosTmrThreads = 1;
+static void*           tmrQhandle;
+static int             numOfTmrCtrl = 0;
+
+int taosTmrThreads = 1;
 
 static uintptr_t nextTimerId = 0;
 
@@ -481,7 +484,13 @@ bool taosTmrReset(TAOS_TMR_CALLBACK fp, int mseconds, void* param, void* handle,
 }
 
 static void taosTmrModuleInit(void) {
-  for (int i = 0; i < tListLen(tmrCtrls) - 1; ++i) {
+  tmrCtrls = malloc(sizeof(tmr_ctrl_t) * taosMaxTmrCtrl);
+  if (tmrCtrls == NULL) {
+    tmrError("failed to allocate memory for timer controllers.");
+    return;
+  }
+
+  for (int i = 0; i < taosMaxTmrCtrl - 1; ++i) {
     tmr_ctrl_t* ctrl = tmrCtrls + i;
     ctrl->next = ctrl + 1;
   }
@@ -526,6 +535,7 @@ void* taosTmrInit(int maxNumOfTmrs, int resolution, int longest, const char* lab
   tmr_ctrl_t* ctrl = unusedTmrCtrl;
   if (ctrl != NULL) {
     unusedTmrCtrl = ctrl->next;
+    numOfTmrCtrl++;
   }
   pthread_mutex_unlock(&tmrCtrlMutex);
 
@@ -536,7 +546,7 @@ void* taosTmrInit(int maxNumOfTmrs, int resolution, int longest, const char* lab
 
   strncpy(ctrl->label, label, sizeof(ctrl->label));
   ctrl->label[sizeof(ctrl->label) - 1] = 0;
-  tmrTrace("timer controller[label=%s] is initialized.", label);
+  tmrTrace("timer controller[label=%s] is initialized, number of timer controllers: %d.", label, numOfTmrCtrl);
   return ctrl;
 }
 
@@ -549,6 +559,7 @@ void taosTmrCleanUp(void* handle) {
 
   pthread_mutex_lock(&tmrCtrlMutex);
   ctrl->next = unusedTmrCtrl;
+  numOfTmrCtrl--;
   unusedTmrCtrl = ctrl;
   pthread_mutex_unlock(&tmrCtrlMutex);
 }