xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TD-2652

This commit is contained in:
Ping Xiao 2021-01-05 16:50:00 +08:00
parent 95b8d347ab
commit 9c7b14b730
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/os/src/detail/osTimer.c
View File

@ -89,12 +89,17 @@ int taosInitTimer(void (*callback)(int), int ms) {
if (code != 0) { if (code != 0) {
uError("failed to create timer thread"); uError("failed to create timer thread");
return -1; return -1;
} else {
uDebug("timer thread:0x%08" PRIx64 " is created", taosGetPthreadId(timerThread));
} }
return 0; return 0;
} }
void taosUninitTimer() { void taosUninitTimer() {
stopTimer = true; stopTimer = true;
uDebug("join timer thread:0x%08" PRIx64, taosGetPthreadId(timerThread));
pthread_join(timerThread, NULL); pthread_join(timerThread, NULL);
} }

3
tests/tsim/src/simExe.c
View File

@ -292,6 +292,9 @@ bool simExecuteRunBackCmd(SScript *script, char *option) {
if (pthread_create(&newScript->bgPid, NULL, simExecuteScript, (void *)newScript) != 0) { if (pthread_create(&newScript->bgPid, NULL, simExecuteScript, (void *)newScript) != 0) {
sprintf(script->error, "lineNum:%d. create background thread failed", script->lines[script->linePos].lineNum); sprintf(script->error, "lineNum:%d. create background thread failed", script->lines[script->linePos].lineNum);
return false; return false;
} else {
simDebug("script:%s, background thread:0x%08" PRIx64 " is created", newScript->fileName,
taosGetPthreadId(newScript->bgPid));
} }
script->linePos++; script->linePos++;

26
tests/tsim/src/simSystem.c
View File

@ -93,23 +93,30 @@ void simFreeScript(SScript *script) {
for (int32_t i = 0; i < script->bgScriptLen; ++i) { for (int32_t i = 0; i < script->bgScriptLen; ++i) {
SScript *bgScript = script->bgScripts[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; bgScript->killed = true;
if (taosCheckPthreadValid(bgScript->bgPid)) { if (taosCheckPthreadValid(bgScript->bgPid)) {
pthread_join(bgScript->bgPid, NULL); pthread_join(bgScript->bgPid, NULL);
} }
}
}
simDebug("script:%s, is freed", script->fileName); simDebug("script:%s, background thread joined", bgScript->fileName);
taos_close(script->taos); taos_close(bgScript->taos);
tfree(script->lines); tfree(bgScript->lines);
tfree(script->optionBuffer); tfree(bgScript->optionBuffer);
tfree(script); tfree(bgScript);
}
simDebug("script:%s, is cleaned", script->fileName);
taos_close(script->taos);
tfree(script->lines);
tfree(script->optionBuffer);
tfree(script);
}
} }
SScript *simProcessCallOver(SScript *script) { SScript *simProcessCallOver(SScript *script) {
if (script->type == SIM_SCRIPT_TYPE_MAIN) { if (script->type == SIM_SCRIPT_TYPE_MAIN) {
simDebug("script:%s, is main script, set stop flag", script->fileName);
if (script->killed) { if (script->killed) {
simInfo("script:" FAILED_PREFIX "%s" FAILED_POSTFIX ", " FAILED_PREFIX "failed" FAILED_POSTFIX ", error:%s", simInfo("script:" FAILED_PREFIX "%s" FAILED_POSTFIX ", " FAILED_PREFIX "failed" FAILED_POSTFIX ", error:%s",
script->fileName, script->error); script->fileName, script->error);
@ -131,7 +138,7 @@ SScript *simProcessCallOver(SScript *script) {
return simScriptList[simScriptPos]; return simScriptList[simScriptPos];
} }
} else { } else {
simInfo("script:%s, is stopped by main script", script->fileName); simDebug("script:%s, is stopped", script->fileName);
simFreeScript(script); simFreeScript(script);
return NULL; return NULL;
} }
@ -161,5 +168,6 @@ void *simExecuteScript(void *inputScript) {
} }
} }
simInfo("thread is stopped");
return NULL; return NULL;
} }