walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

perform all tasks in each loop execution in ThreadExecutor::check() (#2932)

This commit is contained in:
Oliver Stöneberg 2020-12-04 08:07:14 +01:00 committed by GitHub
parent 9c51d4c12d
commit 097abe013d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cli/threadexecutor.cpp
View File

@ -244,7 +244,8 @@ unsigned int ThreadExecutor::check()
pipeFile[pipes[0]] = iFile->first; pipeFile[pipes[0]] = iFile->first;
++iFile; ++iFile;
} }
} else if (!rpipes.empty()) { }
if (!rpipes.empty()) {
fd_set rfds; fd_set rfds;
FD_ZERO(&rfds); FD_ZERO(&rfds);
for (std::list<int>::const_iterator rp = rpipes.begin(); rp != rpipes.end(); ++rp) for (std::list<int>::const_iterator rp = rpipes.begin(); rp != rpipes.end(); ++rp)
@ -284,7 +285,8 @@ unsigned int ThreadExecutor::check()
++rp; ++rp;
} }
} }
} else if (!childFile.empty()) { }
if (!childFile.empty()) {
int stat = 0; int stat = 0;
pid_t child = waitpid(0, &stat, WNOHANG); pid_t child = waitpid(0, &stat, WNOHANG);
if (child > 0) { if (child > 0) {
@ -308,7 +310,8 @@ unsigned int ThreadExecutor::check()
reportInternalChildErr(childname, oss.str()); reportInternalChildErr(childname, oss.str());
} }
} }
} else { }
if (iFile == mFiles.end() && iFileSettings == mSettings.project.fileSettings.end() && rpipes.empty() && childFile.empty()) {
// All done // All done
break; break;
} }