From nobody Mon Jan 19 16:57:15 2026 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 4dvxT73wt4z6P3yN for ; Mon, 19 Jan 2026 16:57:15 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dvxT71dM0z46G2 for ; Mon, 19 Jan 2026 16:57:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768841835; 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=pmoorP8p5FI9m7UShxOnPPzN2te0VKb1uKSfPZJm0n0=; b=OAmxbwxbFtbwPN9/CU2LVpsefYMYyflvaSRAusfBxUFVdaH5mU/5ZxPN4EG475SoB0kdWK AiegYL1oFb+hfOwHAkYayl8LoTKEd8tjoxOND6QJiSux4JqEU7YO6NHGymxGu3dkT+uofD 8DzcEtMxD7SqiVDaHXw1VuX+C+Sf/J53I6wDXG6VeqjNfHk86qLKf4VPS/YCPjUe1fet0o jTfLSPRtqhn04nD1ua8qAZIvPKLNAprXHb0+wEpr0OI2yhJqKVA2ju8g2WNui4+5ZrAd3a 3KDFDG1z+o5yYnwmU0+I8eYafhnoyv0oALpx8OyTPL7lXQBwOjStY3NhQhNOog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768841835; 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=pmoorP8p5FI9m7UShxOnPPzN2te0VKb1uKSfPZJm0n0=; b=r7Ze7kyPHYiuWQ34IrUjFuK5OS6SdHgCyNe3YV1f169WvKJSikhuQNs30/U1F8mMKXOB3P ry0RInCiPUN3x6Zz2rwY0yP3W4bShXfWiNSKbD7+puKxArKt7SXPCb3LgiKLsna2dptsNy JdS/VPPlQJSpSP5VmSWNZYyQCmCFwmAnddVTWlJLHXhCJTNp6OZcSQ6lhdxiqJQ4Pn9Q0I nQgQb5xPa28CJBPhkTKcVZI+I7x/Xd/yFnQgHhBBaDG1VodzvmJAEqxtSeNBZEWIKsjm8n bPHdmFpjp0ZAKBGaTSQ83cYn5pfajrf8Vmeycs6hWmy7GnxxulTdPg4l+QE/pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768841835; a=rsa-sha256; cv=none; b=bcnwFSLFsbgIjJCTbf1JR9dDJd0suqoqmwqy62hdE5zPOyLR8IfORihLvf4ZHwR3N/CdM3 IhAOT4EL5PrI9TlNE54QDRX0yNbN0fFSah9mTpxbusVI9cLxOgsAObfUvO7GXDI/KdRky/ KmdAuab8yQWm3xZexuPtxpMIhN2SYT2etnIX+BjEeEuf+IuiEmj1CNE1DLLEA2XvBwJEVg SPIjt9pkUWtX0dUf/pOUavverQBMgwPc3i4lEUToz2zqutQK7gU7zjYTD3+VXU5t7ljHgT bOPB8ehL5hQLHh8CZjX5zGUgUw+NJKRWmLQB4FSkaAZ/qaE5iCbyuMcGlXqlFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dvxT70TsPzh7t for ; Mon, 19 Jan 2026 16:57:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36d12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Jan 2026 16:57:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ce16be73707e - main - libthr/thread/thr_join.c: deduplicate backout_join() helper 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce16be73707eedc798b26e0741dcd70d1168ac10 Auto-Submitted: auto-generated Date: Mon, 19 Jan 2026 16:57:15 +0000 Message-Id: <696e626b.36d12.5457e375@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ce16be73707eedc798b26e0741dcd70d1168ac10 commit ce16be73707eedc798b26e0741dcd70d1168ac10 Author: Konstantin Belousov AuthorDate: 2026-01-18 12:23:14 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-19 16:49:51 +0000 libthr/thread/thr_join.c: deduplicate backout_join() helper Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D54766 --- lib/libthr/thread/thr_join.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/libthr/thread/thr_join.c b/lib/libthr/thread/thr_join.c index 53f28daa258d..56b316ec0f51 100644 --- a/lib/libthr/thread/thr_join.c +++ b/lib/libthr/thread/thr_join.c @@ -43,16 +43,23 @@ __weak_reference(_thr_join, _pthread_join); __weak_reference(_pthread_timedjoin_np, pthread_timedjoin_np); __weak_reference(_pthread_peekjoin_np, pthread_peekjoin_np); -static void backout_join(void *arg) +static void +backout_join(struct pthread *pthread, struct pthread *curthread) { - struct pthread *pthread = (struct pthread *)arg; - struct pthread *curthread = _get_curthread(); - THR_THREAD_LOCK(curthread, pthread); pthread->joiner = NULL; THR_THREAD_UNLOCK(curthread, pthread); } +static void +backout_join_pop(void *arg) +{ + struct pthread *pthread = (struct pthread *)arg; + struct pthread *curthread = _get_curthread(); + + backout_join(pthread, curthread); +} + int _thr_join(pthread_t pthread, void **thread_return) { @@ -149,10 +156,8 @@ join_common(pthread_t pthread, void **thread_return, _thr_cancel_leave(curthread, 0); THR_CLEANUP_POP(curthread, 0); - if (ret == ETIMEDOUT) { - THR_THREAD_LOCK(curthread, pthread); - pthread->joiner = NULL; - THR_THREAD_UNLOCK(curthread, pthread); + if (ret == ETIMEDOUT || ret == EBUSY) { + backout_join(pthread, curthread); } else { ret = 0; tmp = pthread->ret;