From nobody Thu Oct 30 23:52:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cyLWZ6b6Vz6FnWP; Thu, 30 Oct 2025 23:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cyLWZ2hv4z3cCR; Thu, 30 Oct 2025 23:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761868346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sjmj5f6gW66LDa/0GhAAAAxQ5itIu78BUm23TcMqzsU=; b=Z/S/Z81vE4mnoQEiHq8t+3CbtWFKdxJ1DlVyYsAj+kpMU9o5btQm7/fgJ1qcdQ87wBbDTk A/CaNv53p5IgV2XNF4sp9bJPFEKeA3fsfD+tEgqIdF/IWlfiAXPON3oirXRiDMMohCgiYf TUFuS9MrjocMOAEOXxxN7YUsS1UqwF6ziuQ3r5QCi0yW0ic/iA9t8ZvIJFLaqIn8t8A5Zd z/0hPSUK3m29dWzrxr/ptWZzYXdvbozl2M//kjXZjT1XugCPMFm6tXHLOPMtJ4TCdvJv/X tvB8vqrOHug2Tye/ybIbOHm09PPzE3An1Q8kVItQAlfM7wd4j4642ST2gQr00Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761868346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sjmj5f6gW66LDa/0GhAAAAxQ5itIu78BUm23TcMqzsU=; b=FdYwdecv4WoZIdbhmrlXft5Txhltoq5pBiRNFPqAXEWuVZkMeeHoLemsD/zPQJh0urS39E n35qXAmBApHvtKjkL+OJ3BvvSDFUaJerct0UV/lrmJ6303ByngYLNAMc2UBdQM8ZUoB4f8 +lFwWJAJZYyVZ+LXMgOjBd7yXs3oDxxbhArvaHKr6QRgGNwxwe6J9+ieCtzg1gYmRDkwBU w3yYZzrqhNNL2+DxeJyt4e5zJLAZ/ngtnNZjCNPvGWASXrb7yWcYFgrQ8X+I7jFckpkRx1 egF4Ub55wYPSyhwjQ8LyGUTJPmihMSSlHeX/u2Tj7VyfdHdGYxq3M7IqjLT6vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761868346; a=rsa-sha256; cv=none; b=iBepF0VQCUgYaoHhKhKb/0EOBXHPhdSRbY13LUvMGAcmxvVfwZsSldFgtzQFIUOlVaXVt0 ifppgxHNAmCpB3nM/rAnIBzJc8C6gd32Eb62WX7ldMJFscbZTgJurnFeZDHehyE094eWoQ P7J2Zym2t0CbFnQrxgtvkoMmkesdKcFFO8ev8GPwTMjDUW3+YK+vEuHxDQ5uFCarVFdDoi neb9X3SlxJ1ynJPi4/goSQQUg8JRUXp8EUvnBAeUDjZAIF2fGKCZPAuTSh7Q+cMuCgT69e PgRAsezJv3Ck/06HQPmCHFUv/0+8gn+RHGw2MVxKIV1cFMgvPYnmS6X8ZXB18g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cyLWZ1gJFzkxL; Thu, 30 Oct 2025 23:52:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59UNqQUe087137; Thu, 30 Oct 2025 23:52:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UNqQsW087134; Thu, 30 Oct 2025 23:52:26 GMT (envelope-from git) Date: Thu, 30 Oct 2025 23:52:26 GMT Message-Id: <202510302352.59UNqQsW087134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: ac84e695eb4e - releng/15.0 - rc.subr: Fix slow shutdown issue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: ac84e695eb4ecdd24185649abfd0b692c303d74e Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ac84e695eb4ecdd24185649abfd0b692c303d74e commit ac84e695eb4ecdd24185649abfd0b692c303d74e Author: Dag-Erling Smørgrav AuthorDate: 2025-10-28 11:57:03 +0000 Commit: Colin Percival CommitDate: 2025-10-30 23:48:19 +0000 rc.subr: Fix slow shutdown issue Instead of sleeping after pwait returns, use its new -p option to obtain the list of processes that still have not terminated. Approved by: re (cperciva) MFC after: 3 days PR: 290357 Fixes: 5953e7c98427 ("rc.subr: Move the sleep in wait_for_pids") Reviewed by: 0mp, markj Differential Revision: https://reviews.freebsd.org/D53294 (cherry picked from commit 22cff1f3e9d82b48aad440c52f883bfd4995359c) (cherry picked from commit 7b375832c252430243810ca85d6cbf67820457d5) --- libexec/rc/rc.subr | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 6be226021949..8317ff5c0922 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -792,31 +792,18 @@ sort_lite() # wait_for_pids() { - local _list _prefix _nlist _j + local _list _prefix _j - _list="$@" - if [ -z "$_list" ]; then - return - fi - _prefix= - while true; do - _nlist="" - for _j in $_list; do - if kill -0 $_j 2>/dev/null; then - _nlist="${_nlist}${_nlist:+ }$_j" - fi - done - if [ -z "$_nlist" ]; then - break + for _j in "$@"; do + if kill -0 $_j 2>/dev/null; then + _list="${_list}${_list:+ }$_j" fi - _list=$_nlist + done + _prefix= + while [ -n "$_list" ]; do echo -n ${_prefix:-"Waiting for PIDS: "}$_list _prefix=", " - pwait -o $_list 2>/dev/null - # At least one of the processes we were waiting for - # has terminated. Give init a chance to collect it - # before looping around and checking again. - sleep 1 + _list=$(pwait -op $_list 2>/dev/null) done if [ -n "$_prefix" ]; then echo "."