From owner-svn-src-all@freebsd.org  Thu May 10 17:57:47 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB38EFD1FA1;
 Thu, 10 May 2018 17:57:47 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 6B3087684D;
 Thu, 10 May 2018 17:57:47 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4BFB223C18;
 Thu, 10 May 2018 17:57:47 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4AHvlg4029043;
 Thu, 10 May 2018 17:57:47 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4AHvlwq029042;
 Thu, 10 May 2018 17:57:47 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <201805101757.w4AHvlwq029042@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmacy set sender to
 mmacy@FreeBSD.org using -f
From: Matt Macy <mmacy@FreeBSD.org>
Date: Thu, 10 May 2018 17:57:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r333467 - head/contrib/bmake
X-SVN-Group: head
X-SVN-Commit-Author: mmacy
X-SVN-Commit-Paths: head/contrib/bmake
X-SVN-Commit-Revision: 333467
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 May 2018 17:57:47 -0000

Author: mmacy
Date: Thu May 10 17:57:46 2018
New Revision: 333467
URL: https://svnweb.freebsd.org/changeset/base/333467

Log:
  Revert accidentally commited local change to bmake to prevent debilitating
  excess system time from poor API usage.
  
  Approved by:	sbruno@

Modified:
  head/contrib/bmake/job.c

Modified: head/contrib/bmake/job.c
==============================================================================
--- head/contrib/bmake/job.c	Thu May 10 17:55:24 2018	(r333466)
+++ head/contrib/bmake/job.c	Thu May 10 17:57:46 2018	(r333467)
@@ -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)