From 9c7b14b730f6558befae5053b6ed61eb7d5dab21 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Tue, 5 Jan 2021 16:50:00 +0800
Subject: [PATCH] TD-2652

---
 src/os/src/detail/osTimer.c |  5 +++++
 tests/tsim/src/simExe.c     |  3 +++
 tests/tsim/src/simSystem.c  | 24 ++++++++++++++++--------
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/os/src/detail/osTimer.c b/src/os/src/detail/osTimer.c
index 9883a03a09..1d3ba30def 100644
--- a/src/os/src/detail/osTimer.c
+++ b/src/os/src/detail/osTimer.c
@@ -89,12 +89,17 @@ int taosInitTimer(void (*callback)(int), int ms) {
   if (code != 0) {
     uError("failed to create timer thread");
     return -1;
+  } else {
+    uDebug("timer thread:0x%08" PRIx64 " is created", taosGetPthreadId(timerThread));
   }
+
   return 0;
 }
 
 void taosUninitTimer() {
   stopTimer = true;
+
+  uDebug("join timer thread:0x%08" PRIx64, taosGetPthreadId(timerThread));
   pthread_join(timerThread, NULL);
 }
 
diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c
index 00c9ecac5e..0323f6ca68 100644
--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
@@ -292,6 +292,9 @@ bool simExecuteRunBackCmd(SScript *script, char *option) {
   if (pthread_create(&newScript->bgPid, NULL, simExecuteScript, (void *)newScript) != 0) {
     sprintf(script->error, "lineNum:%d. create background thread failed", script->lines[script->linePos].lineNum);
     return false;
+  } else {
+    simDebug("script:%s, background thread:0x%08" PRIx64 " is created", newScript->fileName,
+             taosGetPthreadId(newScript->bgPid));
   }
 
   script->linePos++;
diff --git a/tests/tsim/src/simSystem.c b/tests/tsim/src/simSystem.c
index db5fddacb8..bf47c56718 100644
--- a/tests/tsim/src/simSystem.c
+++ b/tests/tsim/src/simSystem.c
@@ -93,23 +93,30 @@ void simFreeScript(SScript *script) {
 
     for (int32_t i = 0; i < script->bgScriptLen; ++i) {
       SScript *bgScript = script->bgScripts[i];
-      simInfo("script:%s, set stop flag", script->fileName);
+      simDebug("script:%s, is background script, set stop flag", bgScript->fileName);
       bgScript->killed = true;
       if (taosCheckPthreadValid(bgScript->bgPid)) {
         pthread_join(bgScript->bgPid, NULL);
       }
+
+      simDebug("script:%s, background thread joined", bgScript->fileName);
+      taos_close(bgScript->taos);
+      tfree(bgScript->lines);
+      tfree(bgScript->optionBuffer);
+      tfree(bgScript);
     }
-  }
 
-  simDebug("script:%s, is freed", script->fileName);
-  taos_close(script->taos);
-  tfree(script->lines);
-  tfree(script->optionBuffer);
-  tfree(script);
+    simDebug("script:%s, is cleaned", script->fileName);
+    taos_close(script->taos);
+    tfree(script->lines);
+    tfree(script->optionBuffer);
+    tfree(script);
+  }
 }
 
 SScript *simProcessCallOver(SScript *script) {
   if (script->type == SIM_SCRIPT_TYPE_MAIN) {
+    simDebug("script:%s, is main script, set stop flag", script->fileName);
     if (script->killed) {
       simInfo("script:" FAILED_PREFIX "%s" FAILED_POSTFIX ", " FAILED_PREFIX "failed" FAILED_POSTFIX ", error:%s",
               script->fileName, script->error);
@@ -131,7 +138,7 @@ SScript *simProcessCallOver(SScript *script) {
       return simScriptList[simScriptPos];
     }
   } else {
-    simInfo("script:%s, is stopped by main script", script->fileName);
+    simDebug("script:%s,  is stopped", script->fileName);
     simFreeScript(script);
     return NULL;
   }
@@ -161,5 +168,6 @@ void *simExecuteScript(void *inputScript) {
     }
   }
 
+  simInfo("thread is stopped");
   return NULL;
 }
-- 
GitLab