|
@@ -77,13 +77,15 @@ void CSATExecutor::DelFinishedTask()
|
|
// 删除所有执行器对象;
|
|
// 删除所有执行器对象;
|
|
CPythonExecutor *pExecutor = NULL;
|
|
CPythonExecutor *pExecutor = NULL;
|
|
for (std::vector<SATHTTP::STCase>::iterator _case = it->Job.vtCases.begin(); _case != it->Job.vtCases.end(); _case++ ) {
|
|
for (std::vector<SATHTTP::STCase>::iterator _case = it->Job.vtCases.begin(); _case != it->Job.vtCases.end(); _case++ ) {
|
|
|
|
+ // 一般被停止的任务,才会触发下面的操作;
|
|
pExecutor = (CPythonExecutor *)_case->_pExcutor;
|
|
pExecutor = (CPythonExecutor *)_case->_pExcutor;
|
|
if ( pExecutor ) {
|
|
if ( pExecutor ) {
|
|
- // 结束所有工作线程;
|
|
|
|
- pExecutor->EndThread();
|
|
|
|
// 释放内存;
|
|
// 释放内存;
|
|
delete pExecutor;
|
|
delete pExecutor;
|
|
- pExecutor = NULL;
|
|
|
|
|
|
+ _case->_pExcutor = pExecutor = NULL;
|
|
|
|
+#ifdef _DEBUG
|
|
|
|
+ TRACE2(_T("删除任务成功:%s,%s\n"), it->Job.strTaskId.c_str(), _case->strCaseName.c_str());
|
|
|
|
+#endif
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 删除任务前,变更设备状态为空闲;
|
|
// 删除任务前,变更设备状态为空闲;
|
|
@@ -1225,8 +1227,6 @@ DWORD CSATExecutor::HearbeatThread(LPVOID lpVoid)
|
|
db process
|
|
db process
|
|
*/
|
|
*/
|
|
}
|
|
}
|
|
- // 进行一次删除操作;
|
|
|
|
- that->DelFinishedTask();
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|