From 329d20de97c5338a0a79dd3e127b13950fd382d0 Mon Sep 17 00:00:00 2001 From: Matt Macy Date: Thu, 10 May 2018 17:57:46 +0000 Subject: [PATCH] Revert accidentally commited local change to bmake to prevent debilitating excess system time from poor API usage. Approved by: sbruno@ --- contrib/bmake/job.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/contrib/bmake/job.c b/contrib/bmake/job.c index 00c2304f1db..c5eca9936ef 100644 --- a/contrib/bmake/job.c +++ b/contrib/bmake/job.c @@ -2121,15 +2121,13 @@ Job_CatchOutput(void) { int nready; Job *job; - int i, pollToken; + int i; (void)fflush(stdout); - pollToken = 0; - /* The first fd in the list is the job token pipe */ do { - nready = poll(fds + 1 - pollToken, nfds - 1 + pollToken, POLL_MSEC); + nready = poll(fds + 1 - wantToken, nfds - 1 + wantToken, POLL_MSEC); } while (nready < 0 && errno == EINTR); if (nready < 0)