From nobody Tue Oct 28 11:57:44 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 4cwpls0kLjz6DmSt; Tue, 28 Oct 2025 11:57:45 +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 4cwpls02gkz3WRT; Tue, 28 Oct 2025 11:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652665; 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=h7qR1f81l843O+9Wrx4g8gwXYr2tybidz326zof8PZs=; b=vt6EomPVTS0n3RX9tTUYv/kV+gxr16MCvfwfZ8/5OVhxDKTVBCuGL9fLaJdcu6tQz1twjy 3OXDzZxuGtRshRkIDFX7E1vyHikCjmplGGiocrJNxl6G/4CT+v+FR+k3eRZF5TmU24pNZ9 hncVZnot3MtvtDxOVHI//gb1zKFBFmlvTXP6jc73oehntoWL/bOAYltEbvZTh3y9Dyar/6 DTWFAMdU9wvdzwg/hlRW4ZWK1tf6rTH+TFWN8rM+g9z1H/BRmB6PhgL/Kq0FdFi8UqZWIf xOeOwCFcKS2+Jd6L1f5cBTEn9pJtndQ8jGZdm5+Wa7w9/5Cec7Y66g55YsBFUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761652665; 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=h7qR1f81l843O+9Wrx4g8gwXYr2tybidz326zof8PZs=; b=XzQa31zvEACqLqKQqLt04ZanSW4GDovTJ8ifDjDZhjw7+nHjRH6ISeG9G8ibBP1gRFt22Z 3pMeap2QVYF14auLNlqQPfwFE6RSsebPKz06twVpmk9bKiNO2GqeY6Iuug7qKTBnR1MRam epo+uqhVFR4KQEgkHrgY4UMhfVsUdRyb0ci8BU8+FikrFEGNnxA6P+DntkhsXbZOqHK1hh g2WirTfKjB9jWvfGQVnTH30qfnWt2sLMBkHhSiGKAiXo/j3rERbiScvKzDJUjx0wJtw2q+ SoC+nWUNArOk/LDNul+FRsuqIke+foPYvNvn5jNab9wHvgofcu0ywXPA1/nHbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761652665; a=rsa-sha256; cv=none; b=aE8UTisie7TruFJO4+JNY2yFSMSKYik5VLcHJcvUC61wl7o/yBcISG5jUORHm+d46Pt4jN Cf2TLuJCGXCp+auwLGx1R14HIZGeputjX7+dBDqzzWK7ZlsxXNDZ76E/XYjhaPT5+y+ZfM YVa7ZDuR3gJHmKAwH9ADxV4Vm4E0TSNjy7LuVQrt9JxsOBOgJA2EEAHaPKTxSGRm2oQjJE V7FSdqfdTtTpCcOiigbn/kLmFd8WO3w95kYED9G24Yo+efR3yvr+NKShtk3X1WaTnyUn5J pGxNXezTgY7JzqYUhf7PJKs+QJi/LP8UbFwVy1etYCcWVTj6dTgKurdqhFpPTw== 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 4cwplr6YrzzpdB; Tue, 28 Oct 2025 11:57:44 +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 59SBviE4002909; Tue, 28 Oct 2025 11:57:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59SBviEm002906; Tue, 28 Oct 2025 11:57:44 GMT (envelope-from git) Date: Tue, 28 Oct 2025 11:57:44 GMT Message-Id: <202510281157.59SBviEm002906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 22cff1f3e9d8 - main - 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22cff1f3e9d82b48aad440c52f883bfd4995359c Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=22cff1f3e9d82b48aad440c52f883bfd4995359c commit 22cff1f3e9d82b48aad440c52f883bfd4995359c Author: Dag-Erling Smørgrav AuthorDate: 2025-10-28 11:57:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-28 11:57:16 +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 --- 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 "."