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

Remove unnecessary overhead in execunix.c related to

Browse Source 
the timeout implementation.  Also removed unused variables
as diagnosed by the Sgi (mipspro) compiler.

Fixed const-correctness error in operations.hpp that
Sgi complained about.

There's no strerror_r function on Irix 6.5 so I replaced
it with a strerror call.

With these changes, I can now build process jam log and
start running Sgi tests.



[SVN r39378]
This commit is contained in:
K. Noel Belcourt
2007-09-18 22:46:26 +00:00
parent 9b86b6de5a
commit 30607d79c5
1 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
historic/jam/src/execunix.c
View File

@@ -59,7 +59,8 @@
* 06/02/97 (gsar) - full async multiprocess support for Win32
*/
static struct timeval tv, *tv_ptr = 0;
static clock_t tps = 0;
static struct timeval tv;
static int intr = 0;
static int cmdsrunning = 0;
static void (*istat)( int );
@@ -110,7 +111,6 @@ execcmd(
int out[2], err[2];
int slot, len;
char *argv[ MAXARGC + 1 ]; /* +1 for NULL */
FILE *stream;
/* Find a slot in the running commands table for this one. */
@@ -161,6 +161,8 @@ execcmd(
argv[3] = 0;
}
if (tps == 0) tps = sysconf(_SC_CLK_TCK);
/* increment jobs running */
++cmdsrunning;
@@ -317,7 +319,7 @@ execcmd(
int read_descriptor(int i, int s)
{
int done, ret, len;
int ret, len;
char buffer[BUFSIZ];
while (0 < (ret = fread(buffer, sizeof(char), BUFSIZ-1, cmdtab[i].stream[s])))
@@ -378,7 +380,6 @@ void populate_file_descriptors(int *fmax, fd_set *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);
@@ -395,31 +396,18 @@ void populate_file_descriptors(int *fmax, fd_set *fds)
int
execwait()
{
int i, j, len, ret, fd_max;
int i, ret, fd_max;
int pid, status, w, finished;
int rstat;
timing_info time;
fd_set fds;
struct tms old_time, new_time;
char *tmp;
char buffer[BUFSIZ];
struct tms buf;
/* Handle naive make1() which doesn't know if cmds are running. */
if( !cmdsrunning )
return 0;
/* force select to timeout so we can terminate expired processes */
if (globs.timeout) {
tv.tv_sec = globs.timeout;
tv.tv_usec = 0;
tv_ptr = &tv;
}
else {
tv_ptr = 0;
}
/* process children that signaled */
finished = 0;
while (!finished && cmdsrunning)
@@ -427,16 +415,26 @@ execwait()
/* compute max read file descriptor for use in select */
populate_file_descriptors(&fd_max, &fds);
/* select will wait until io on a descriptor or a signal */
ret = select(fd_max+1, &fds, 0, 0, tv_ptr);
if (0 < globs.timeout) {
/* force select to timeout so we can terminate expired processes */
tv.tv_sec = globs.timeout;
tv.tv_usec = 0;
if (0 == ret) {
/* select timed out, all processes have expired, kill them */
for (i=0; i<globs.jobs; ++i) {
cmdtab[i].start_time = 0;
}
/* select will wait until io on a descriptor or a signal */
populate_file_descriptors(&fd_max, &fds);
ret = select(fd_max+1, &fds, 0, 0, &tv);
if (0 == ret) {
/* select timed out, all processes have expired, kill them */
for (i=0; i<globs.jobs; ++i) {
cmdtab[i].start_time = 0;
}
/* select will wait until io on a descriptor or a signal */
populate_file_descriptors(&fd_max, &fds);
ret = select(fd_max+1, &fds, 0, 0, 0);
}
}
else {
/* select will wait until io on a descriptor or a signal */
ret = select(fd_max+1, &fds, 0, 0, 0);
}