From nobody Thu Oct 2 08:20:39 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 4ccl9M44rdz69KRR; Thu, 02 Oct 2025 08:20:39 +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 4ccl9M3NTbz4MvC; Thu, 02 Oct 2025 08:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759393239; 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=ReamLlaJAERdo7FDF0HV0Gytuc8HqKGzzT7ArspQ/ic=; b=ePEeg38r3wu/acO60G6OgyfGrHUlf9R3FaGBS7MfwbRauKogU9SjOmic6Uq2mYkiGG7i8x 4j5TdnJzEd3ISenzEIi+epOFXXQ55LTYBlpiLBtfDzHI+SAqNaLYEeHoQQSUWDQSyLpopo Q/kWrAO5xhjHaIS0uH8uZyrtwATzlHfDUD1nDUtJR6QGQn6NX89MzW/fjAit5S47C+XiHM cKc6rO0SThT6JdOEnIxIFAGBAFesVr+FSN8M+KfQLZA8unwhDaCQyROa72dsMgnGuvR4jz am7yY4wf5C7cY265jZAOraoccTOkegYuX8ws1AMw9IxOjLtIibQMG9Ve8O8yfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759393239; 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=ReamLlaJAERdo7FDF0HV0Gytuc8HqKGzzT7ArspQ/ic=; b=KuVfYajTYZXadLWs3j0Rh7Qkduj2I3VmN1EwR35AP43JG1fYnXpH52gTuJ26gjmYGmM6le diNSXnvA9T15mgfjZuF3/bN8dciC1TMQMGBwDFSWOFAuXrbYCIoC+MuXNBwUjVwWAnvqqx QQKfDI3I4pF4vX5pHZt5krnC6F3pLXycf44SyPEfAbqWlUZ2n1YJAZDje9js44Lq8QGujy iJb8zwoSM++R8/SbG+yH3PtZ3rU3q35mKSDNUMfc5LigyJveWD1eGDicvxnJyqIgvHvI+v FD1hZpPYwvjDdE6v8XMyd0DK0dHqBUV0e10SDw0vI4ujriXNcVRKCSocedx1DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759393239; a=rsa-sha256; cv=none; b=SlQeF6EpCGWJ/MQp0JvuX6ikWUJfNgDit7vhNVkf7NGpkBTQc86I2edw0/sy4G2rYtABXK KYPNQ18wQjDcfTxLqkXcbN9xKCIFFd1fu9DVmbZcesWEzMF4BpDvxdUqwkoqk45lz9x8h9 FWZNurmk9mmGJaI5O731QVA6KpOwyM9Gab37xcg1H7VGvfSiC/fpsApfNVLfTE70Ad2KXS RMEtI0UaNkjqm1nopH6bhso+kPvElC2gAHFJEQq67wujOISt0+buCQoq+KkN7dQKYMsSE/ HME3aYC0z+yClhXyPQ+kqO3wHHKHM4h2pg9tCdeZLgqd1/CyuJkKAVOKIzdFEA== 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 4ccl9M2mY4z10Kk; Thu, 02 Oct 2025 08:20:39 +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 5928Kd9p022974; Thu, 2 Oct 2025 08:20:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5928KdU6022971; Thu, 2 Oct 2025 08:20:39 GMT (envelope-from git) Date: Thu, 2 Oct 2025 08:20:39 GMT Message-Id: <202510020820.5928KdU6022971@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: 384006a4c59f - stable/15 - rc.subr: Move the sleep in wait_for_pids 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: 384006a4c59f9f8c844cf0eb51a3144dd2a1795d Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=384006a4c59f9f8c844cf0eb51a3144dd2a1795d commit 384006a4c59f9f8c844cf0eb51a3144dd2a1795d Author: Dag-Erling Smørgrav AuthorDate: 2025-09-23 12:55:56 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-02 08:19:22 +0000 rc.subr: Move the sleep in wait_for_pids Instead of sleeping while constructing the list of PIDs to wait for, sleep briefly after pwait to give init a chance to reap the processes that just terminated before we loop around and start probing them. PR: 289630 Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D52619 (cherry picked from commit 5953e7c98427e038500221e885dffa181dcc064b) --- libexec/rc/rc.subr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 06b1bd51384c..6be226021949 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -804,7 +804,6 @@ wait_for_pids() for _j in $_list; do if kill -0 $_j 2>/dev/null; then _nlist="${_nlist}${_nlist:+ }$_j" - [ -n "$_prefix" ] && sleep 1 fi done if [ -z "$_nlist" ]; then @@ -814,6 +813,10 @@ wait_for_pids() 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 done if [ -n "$_prefix" ]; then echo "."