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

TD-2652 tsim may crash after the script is executed successfully

This commit is contained in:
Shengliang Guan 2021-01-05 11:19:14 +08:00
parent 7138b29f96
commit 64d3b4aefe
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,7 +448,6 @@ void simCloseNativeConnect(SScript *script) {
simDebug("script:%s, taos:%p closed", script->fileName, script->taos); simDebug("script:%s, taos:%p closed", script->fileName, script->taos);
taos_close(script->taos); taos_close(script->taos);
taosMsleep(1200);
script->taos = NULL; script->taos = NULL;
} }

6
tests/tsim/src/simMain.c
View File

@ -40,14 +40,14 @@ int32_t main(int32_t argc, char *argv[]) {
printf("usage: %s [options] \n", argv[0]); printf("usage: %s [options] \n", argv[0]);
printf(" [-c config]: config directory, default is: %s\n", configDir); printf(" [-c config]: config directory, default is: %s\n", configDir);
printf(" [-f script]: script filename\n"); printf(" [-f script]: script filename\n");
exit(0); return 0;
} }
} }
if (!simSystemInit()) { if (!simSystemInit()) {
simError("failed to initialize the system"); simError("failed to initialize the system");
simSystemCleanUp(); simSystemCleanUp();
exit(1); return -1;
} }
simInfo("simulator is running ..."); simInfo("simulator is running ...");
@ -56,7 +56,7 @@ int32_t main(int32_t argc, char *argv[]) {
SScript *script = simParseScript(scriptFile); SScript *script = simParseScript(scriptFile);
if (script == NULL) { if (script == NULL) {
simError("parse script file:%s failed", scriptFile); simError("parse script file:%s failed", scriptFile);
exit(-1); return -1;
} }
simScriptList[++simScriptPos] = script; simScriptList[++simScriptPos] = script;

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

@ -113,7 +113,7 @@ SScript *simProcessCallOver(SScript *script) {
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);
exit(-1); return NULL;
} else { } else {
simInfo("script:" SUCCESS_PREFIX "%s" SUCCESS_POSTFIX ", " SUCCESS_PREFIX "success" SUCCESS_POSTFIX, simInfo("script:" SUCCESS_PREFIX "%s" SUCCESS_POSTFIX ", " SUCCESS_PREFIX "success" SUCCESS_POSTFIX,
script->fileName); script->fileName);
@ -125,7 +125,7 @@ SScript *simProcessCallOver(SScript *script) {
if (simScriptPos == -1) { if (simScriptPos == -1) {
simInfo("----------------------------------------------------------------------"); simInfo("----------------------------------------------------------------------");
simInfo("Simulation Test Done, " SUCCESS_PREFIX "%d" SUCCESS_POSTFIX " Passed:\n", simScriptSucced); simInfo("Simulation Test Done, " SUCCESS_PREFIX "%d" SUCCESS_POSTFIX " Passed:\n", simScriptSucced);
exit(0); return NULL;
} }
return simScriptList[simScriptPos]; return simScriptList[simScriptPos];