From nobody Wed Jun 25 17:17:37 2025 X-Original-To: dev-commits-src-main@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 4bS7mf157qz60HgX; Wed, 25 Jun 2025 17:17:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bS7md6W3wz3S8d; Wed, 25 Jun 2025 17:17:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750871857; 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=T8ukSQxhqZj2DKuIedgpGiZcVym6EA4cS0S8/DlmPUY=; b=d4CoFpReKXDYhGBOXMJ18V7L99zIYt43Sfut0RlGMY0Kz8kmoXC/n7wUZ4S28GyTH9jnPu 6WI5CLh4tjG4T9ljgB60b8dJcJ9ecZMXvO9ff7gg1QNjOE680z9rNg8b69e6vIqkWvxT2N +fGM24wn5Mci2wkfaIQGeiRCmmeTZ2ayyIQL7P1g6/YomP+tnIwXRRdWZ9kQA+X8Dx8zrp w3T02QG/gBnzFy+J6NauchJrsq+VoyAd1plsIHgWEPlrcYotD29kTOiPeofxCDiySis8ea 2269mDfgJPrpfjU96P4+ReOLGaW3x+uld5AnJjXhuxMSmHGf1yTt0VVvPxA+yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750871857; 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=T8ukSQxhqZj2DKuIedgpGiZcVym6EA4cS0S8/DlmPUY=; b=HsToxpklw0O+ztzuZQOYna695DWy0iOuDdFbg2WuyYDybQBSVk8IPb6Weo98RNlX4WNab3 9wOYOJmmNPV/bNUIM2MoNrn5/cEd1h0Lw5hlEcl4U1OdGcC3qNXZZqCI0NDQrjg36P/mmS HfOJZBZ3Rj8qiingimIySEa+0s9qJ5BhOWphc8i2iqbMGHeCIkudfEgP0HoVIiJq7Js0Ds 7rg8+Tlx0sMpAXLNaDu/5B7WNiRZQ256wTAW5PsLHIfOadEcT4uOVjKNjWLEF9oclzbk4P BYHPtkOGYjod1Oq9yJbDxKzenj6QjWKlbIj5l1uEyP9mWZ9+wZv/jHTZVNnHjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750871857; a=rsa-sha256; cv=none; b=W46RkpuYGqO1GAc0X4TlcbVT5URRrvGA6I8hvmsdzL4yr7oVuTLfxBl4+1pevmoi3W0MAQ 03dLX8ravU1glpJ0TsMhKFttUeKERsWV3dI17fqFD61/fnVItAiweS5re0osSncb+78U0e n515m191vTPYuRkLcaOjRjatwZUt2yrBTf+ZLKPUomFWYiKMoE6OATsq16sfwRYr91euYQ fOYvBJjhK1PumtiT6dhsyc4/MtIS6oeApSEq9JW9LW4ne7zL+PEfAYyB+qwaIuyZv6C0bm eqfINSsEscqfTfQXmL9b8mwHnbSKyjnmcR2JFKaeaoAHYUeBovFxzWA7PWdeow== 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 4bS7md64L6z9HD; Wed, 25 Jun 2025 17:17:37 +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 55PHHb0p061114; Wed, 25 Jun 2025 17:17:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55PHHbV1061111; Wed, 25 Jun 2025 17:17:37 GMT (envelope-from git) Date: Wed, 25 Jun 2025 17:17:37 GMT Message-Id: <202506251717.55PHHbV1061111@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7b26124ae106 - main - libtpool/tests: Fix a flaky test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: 7b26124ae106283952e1e61d07f0eecda5c361a0 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7b26124ae106283952e1e61d07f0eecda5c361a0 commit 7b26124ae106283952e1e61d07f0eecda5c361a0 Author: Mark Johnston AuthorDate: 2025-06-25 14:19:27 +0000 Commit: Mark Johnston CommitDate: 2025-06-25 17:17:08 +0000 libtpool/tests: Fix a flaky test I occasionally see failures due to pthread_barrier_wait() not returning 0. There is another possible non-error return value, so allow that too. While here, check the result in tp_delay() as well. Fixes: 5c1ba994a8bc ("Add a regression test for a libtpool bug") Differential Revision: https://reviews.freebsd.org/D50967 --- cddl/lib/libtpool/tests/libtpool_test.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cddl/lib/libtpool/tests/libtpool_test.c b/cddl/lib/libtpool/tests/libtpool_test.c index 42726a13420c..42bce269cb23 100644 --- a/cddl/lib/libtpool/tests/libtpool_test.c +++ b/cddl/lib/libtpool/tests/libtpool_test.c @@ -11,9 +11,12 @@ static void tp_delay(void *arg) { pthread_barrier_t *barrier = arg; + int r; /* Block this task until all thread pool workers have been created. */ - pthread_barrier_wait(barrier); + r = pthread_barrier_wait(barrier); + ATF_REQUIRE_MSG(r == 0 || r == PTHREAD_BARRIER_SERIAL_THREAD, + "pthread_barrier_wait failed: %s", strerror(r)); } /* @@ -38,7 +41,6 @@ ATF_TC_BODY(complete_exhaustion, tc) int nworkers; int r, i; - len = sizeof(max_threads_per_proc); r = sysctlbyname("kern.threads.max_threads_per_proc", &max_threads_per_proc, &len, NULL, 0); @@ -65,7 +67,9 @@ ATF_TC_BODY(complete_exhaustion, tc) ATF_REQUIRE_EQ(tpool_dispatch(tp1, tp_delay, NULL), -1); /* Cleanup */ - ATF_REQUIRE_EQ(pthread_barrier_wait(&barrier), 0); + r = pthread_barrier_wait(&barrier); + ATF_REQUIRE_MSG(r == 0 || r == PTHREAD_BARRIER_SERIAL_THREAD, + "pthread_barrier_wait failed: %s", strerror(r)); tpool_wait(tp1); tpool_wait(tp0); }