From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E18BD138359 for ; Sun, 4 Oct 2020 19:30:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CFBEE07F9; Sun, 4 Oct 2020 19:30:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 02294E07F9 for ; Sun, 4 Oct 2020 19:30:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B97D6335D9B for ; Sun, 4 Oct 2020 19:30:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2AD0D373 for ; Sun, 4 Oct 2020 19:30:02 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1601839686.d5579e07d763403aa8ac770a97e3c36c96f6540a.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qlop.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: d5579e07d763403aa8ac770a97e3c36c96f6540a X-VCS-Branch: master Date: Sun, 4 Oct 2020 19:30:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c1b05d12-477b-43a7-9616-d55a055f5f87 X-Archives-Hash: 37768e8085c8e81e8ee22f623e2a489f commit: d5579e07d763403aa8ac770a97e3c36c96f6540a Author: Fabian Groffen gentoo org> AuthorDate: Sun Oct 4 19:28:06 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Oct 4 19:28:06 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d5579e07 qlop: adapt terminating/exiting logic somewhat It seems that exiting doesn't always come immediately (= the same second) after terminating, so allow a small window (4s) for these to come in sequence to treat them as a single termination. Signed-off-by: Fabian Groffen gentoo.org> qlop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qlop.c b/qlop.c index 762523f..5045d17 100644 --- a/qlop.c +++ b/qlop.c @@ -508,7 +508,7 @@ static int do_emerge_log( if (p[7] == 'm') { parallel_emerge++; } else if (parallel_emerge > 0) { - if (p[7] != 'e' || tstart != last_exit) + if (p[7] != 'e' || (tstart - 4) <= last_exit) parallel_emerge--; if (p[7] == 'x') last_exit = tstart;