From nobody Mon Jun 22 13:26:25 2026 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 4gkTVp0Svvz6hBw3 for ; Mon, 22 Jun 2026 13:26: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gkTVn2DTDz3r8V for ; Mon, 22 Jun 2026 13:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782134785; 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=rKlllbJQSU7YWg6LrhKvOD/F64FJQawSI9wXMtCzzL4=; b=qXFTa6Gx3GnoQk4pjwzR9aHERbEA4BIl6riw7/ORffntdxNJ1CND0jvwGhXhngYZEyQqwK kH0R8Sz3nvlKstV9MLZaurYXtwOqhC2UZ1Hrja3U3YVbpVOhZrHuopZJAT1w+G+rUUHmCD JkLOH7uMv2ghWrvCuWJCYsw5O9QRmHu6XlmoQc+gQO4xKBEMA25+ieM6H87Pk8pdJD5I+P hsbm9VaBjnn8LzrZpm4SJeQvH8BAcIfjXkaENN+zFaKE15kKm1NBIgED4xiKMUr6n9l4gV JwTj89ZNGH/f62LP/AZoVGG5xoW8CQYs0aLy0+JbuBDobCKyCWbkFVc1A/Pb1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782134785; a=rsa-sha256; cv=none; b=WJHPhKNggN4JB13dR1+EuF2sE6cu66V3cnZAniNpjGrK9WiXahvUCDOJZBSnkER1sQt4NT 9PyyPtw8rpmE5R+HOqs6tASbD87AyefTLQXJ+8h8ckYlxgrvidN4N0lXXxc1C5HiT33J8F XFy4P0FpKN7QRyDJdAUNrRyuKz8JyYk0nhzM7ZDjRca91NpUyb2zE2d8sAokVBGyeqFO0+ zu8iNoFsIvJItDBPRqLk81RrCMAmN0X8JakKVHKR7t8ynJV/K1wX3UAdEVHHg9vbADMirQ 2a4frbnGxgjZ6C6ux1QWYfv3bsPJluUsOQ16UeE8DjSNpjOZlumYtIBEGfX9jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782134785; 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=rKlllbJQSU7YWg6LrhKvOD/F64FJQawSI9wXMtCzzL4=; b=WACASDZhsGkk/XWyxX5REYmuKZgaBLA4v3ertaHnJwoms1S3TeqKA54GGF3fDnFpnMWxmw eWKrulXJFuYddmF2CC6B0PITPTwWri1FsAcB8jWD0rxGRv03mwRpS+Jo/zX9kjU+xSr4Zf TFowb/8o5Zaq6n3Dqzs3wOlbwDPfOFE1P3mpLTzOWiPU6IIwhwJG3UGfuYU7Bp7ofa/XLt 9j8vUK3pHGI7CDv55GDebvIELeaYuhkaHUUrPqFmNQDDjY29uQSy0NZeBdOj+3nNYBMKrU d1QUstftLIH8qscASa4vMT1GLS5E99+kN1EN1j1FaoKwzJj2xAtZf9NBOHaDZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gkTVn1JJFzq8g for ; Mon, 22 Jun 2026 13:26:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3976c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 22 Jun 2026 13:26:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7c7725dd75e1 - stable/15 - tests/jaildesc: Use a more efficient mechanism to block 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7c7725dd75e185f8c4026a382d9831b9a7df6b0b Auto-Submitted: auto-generated Date: Mon, 22 Jun 2026 13:26:25 +0000 Message-Id: <6a393801.3976c.6db045f5@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7c7725dd75e185f8c4026a382d9831b9a7df6b0b commit 7c7725dd75e185f8c4026a382d9831b9a7df6b0b Author: Mark Johnston AuthorDate: 2026-06-12 14:58:43 +0000 Commit: Mark Johnston CommitDate: 2026-06-22 13:26:09 +0000 tests/jaildesc: Use a more efficient mechanism to block MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D57148 (cherry picked from commit 75b23c102e8d797654025affdfada0b6771a95ba) --- tests/sys/kern/jaildesc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/sys/kern/jaildesc.c b/tests/sys/kern/jaildesc.c index cfdd1529fdfa..6c7993cfc1d3 100644 --- a/tests/sys/kern/jaildesc.c +++ b/tests/sys/kern/jaildesc.c @@ -120,8 +120,7 @@ ATF_TC_BODY(poll_close_race, tc) error = pthread_create(&thr, NULL, poll_jaildesc, &jd); ATF_REQUIRE_MSG(error == 0, "pthread_create: %s", strerror(error)); - /* Wait for the thread to block in poll(2). */ - usleep(250000); + wait_for_naptime(getpid(), "select"); ATF_REQUIRE_MSG(close(jd) == 0, "close: %s", strerror(errno)); @@ -150,8 +149,7 @@ ATF_TC_BODY(poll_remove_wakeup, tc) error = pthread_create(&thr, NULL, poll_jaildesc, &jd); ATF_REQUIRE_MSG(error == 0, "pthread_create: %s", strerror(error)); - /* Wait for the thread to block in poll(2). */ - usleep(250000); + wait_for_naptime(getpid(), "select"); ATF_REQUIRE_MSG(jail_remove_jd(jd) == 0, "jail_remove_jd: %s", strerror(errno)); @@ -219,8 +217,7 @@ ATF_TC_BODY(poll_close_race_get_desc, tc) error = pthread_create(&thr, NULL, poll_jaildesc, &jd); ATF_REQUIRE_MSG(error == 0, "pthread_create: %s", strerror(error)); - /* Wait for the thread to block in poll(2). */ - usleep(250000); + wait_for_naptime(getpid(), "select"); ATF_REQUIRE_MSG(close(jd) == 0, "close: %s", strerror(errno));