boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-13 12:22:17 +00:00
Code Issues Projects Releases Wiki Activity

Fix One more obscure way for the timeout to miss processes.

Browse Source 
If select times out (no processes terminated), then all running
processes can be terminated.  Cleaned up code when this condition
applies.



[SVN r39360]
This commit is contained in:
K. Noel Belcourt
2007-09-18 02:42:13 +00:00
parent 4468f9e815
commit 445da99019
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/engine/execunix.c
View File

@@ -375,6 +375,15 @@ void populate_file_descriptors(int *fmax, fd_set *fds)
FD_SET(cmdtab[i].fd[ERR], fds);
}
}
if (globs.timeout && cmdtab[i].pid) {
struct tms buf;
clock_t tps = sysconf(_SC_CLK_TCK);
clock_t current = times(&buf);
if (globs.timeout <= (current-cmdtab[i].start_time)/tps) {
kill(cmdtab[i].pid, SIGKILL);
}
}
}
*fmax = fd_max;
}
@@ -422,15 +431,11 @@ execwait()
ret = select(fd_max+1, &fds, 0, 0, tv_ptr);
if (0 == ret) {
clock_t tps = sysconf(_SC_CLK_TCK);
/* select timed out, check for expired processes */
/* select timed out, all processes have expired, kill them */
for (i=0; i<globs.jobs; ++i) {
if (0 < cmdtab[i].pid) {
clock_t current = times(&buf);
if (globs.timeout <= (current-cmdtab[i].start_time)/tps) {
kill(cmdtab[i].pid, SIGKILL);
}
kill(cmdtab[i].pid, SIGKILL);
}
}
/* select will wait until io on a descriptor or a signal */