From nobody Thu Oct 30 10:37:59 2025 X-Original-To: dev-commits-src-branches@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 4cy0tw1kfVz6FSgL; Thu, 30 Oct 2025 10:38:00 +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 4cy0tv3Xtyz3yfP; Thu, 30 Oct 2025 10:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761820679; 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=PC0+FjySpLSviHf0CijktTnj18VUsGvNYAN3iZItk+M=; b=I1btsFoLT9OvbUkUgwDnL4LeKjD0fiAtzUszLHOuLeurzOLVFJJDnSbNmWwX2+2SibDCDN 1BaEMjP6NFsovqhlcYhcwshbSTooyigKG+RnEjJFGhEMMfTTBJWmV37vUfMA+ybsV9vE3T xJ0IMOQYrl6H2SJO2kQfkTdxWAFptTWxeY1hdfUXJuoczjceDHAbaKhorFFIeEgtee70qx 7cxguFWfhXKzKJ1GJh9uys0eQM8ELGQPcAoxZANjT8XVEfSkd/x5ZMMWatgYLbEiHcR0Zm UBCwXOJdrDkrXmDYdZnroDti0uX5Qb+RL8o/j4OwM7Q6xyflRxYiqJN7oxZ61A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761820679; 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=PC0+FjySpLSviHf0CijktTnj18VUsGvNYAN3iZItk+M=; b=JBRO49HxUfEyEBsx5LFyS85tL6tMz7yMngFMZovBYkYNOgqjDHvQde6hlQxYKHGixwtHd5 RcW2LelMNJzcZsImwl6HTFNVkzuz02boDeiL7SR3TZmRZ80yfR5/Z6jkbf0ctbywEERnbK 7t238ux/qE4+8Lp5u8uZm7e/PWhUp45xlF/LxhuhexMiwVxu16R5U7QIlPjEcjsL9CXEF1 eOZR8k6ZoWl6GpoAEFhXzkBeIl0A28ph12xj10/xvLya7iwHijDtKFITKXDh/9qXV8cJVF nyuxIxbPyspUyP7bL+UNDjV+6o2i+psjQZ87TK3UCkomE/VjMTb6hcZLscQw+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761820679; a=rsa-sha256; cv=none; b=vE8FQ7HCpp4pat7JYuZI1rZVkxmwgD0K+q//kkMtle8SX5z4ZgIK9/KLBL79RJDe1Krvtb 3A2X73g3KeEZHz4NXqifQne9Gt88ckv3TwYASOlgDn5v8KqR07ziUHSyNKYU5e9cEJJf2z m4Cx/987bqDNpmXaUfEdM9KO4BfkXK5a7PjKrATkkJC3iBIV0pqTo3jodx9YS6zVC55nMF +W0I3AgPm8p4v4qVtDiIeW0KRBL8AwWsIq9tuiKnHymGTj86zHHQOyCGwdkjsyT0FRRdYE OVga7F1zpWNa39H74/xtecuRuMpbm6jyR9V3O9bHhL7vz8KKJZaqTUje/IGTUQ== 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 4cy0tv379xz3fl; Thu, 30 Oct 2025 10:37:59 +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 59UAbxkH082045; Thu, 30 Oct 2025 10:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UAbx64082042; Thu, 30 Oct 2025 10:37:59 GMT (envelope-from git) Date: Thu, 30 Oct 2025 10:37:59 GMT Message-Id: <202510301037.59UAbx64082042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 7b375832c252 - stable/15 - rc.subr: Fix slow shutdown issue List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7b375832c252430243810ca85d6cbf67820457d5 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7b375832c252430243810ca85d6cbf67820457d5 commit 7b375832c252430243810ca85d6cbf67820457d5 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-28 11:57:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-30 10:37:35 +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. 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) --- 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 "."