From nobody Sun Jan 25 00:24:48 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 4dzC9D3cN7z6PtsX for ; Sun, 25 Jan 2026 00:24:48 +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 4dzC9D1h9pz3cw8 for ; Sun, 25 Jan 2026 00:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300688; 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=vEuvFrusE6jU32Gx32MK1GpHgdviNOhAwtR6+Pr1gMU=; b=mBxu0maG+I0utfsWw0v5NrXMaJb1xSnIdycs1W5rSI35tVI/R1VdJLWDr4GGLCD+XB1FiQ dCZuIaG59LOrmG280YBdfBAqT5qeLQvQOxydGJ6gQXq34/rMeGuHy3fho8o2LB+MaCAyjJ p4VyJZlefTVkTJsPIJx4V5DmzvIZ8thzCjgYYIp0NyZpuBjVCS0kB+3bYmZ7+u3dKKmbgA pCb7W5lxZVDMOlJkxmVbNCho8FdP44au3CfjO0i6Htoe0ZyS1+H2TSumlMjz2z46qAcBsj uiXl8FFCDOuMi2vnXe0tfQ+v9eAmgoWj+CdkGvuwwDPVeX1SwhLNq27JjTLKrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300688; 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=vEuvFrusE6jU32Gx32MK1GpHgdviNOhAwtR6+Pr1gMU=; b=c1J30RvjHonY/uIrKF+KpiZn6v5klS1C7UWLiQi8QkJrcy+pmf5byEQil1gd/pN1N55xI+ r+j2uxMAd9LJJpvBTw1NVQOs0jUKELQYtia+OPnXn3TaJHy5mJ9yqxmhZPR4mmEsMGLGHl FCvNpQfRUQYfapwVb3vmecsfzeO7H2go9HdDht2NjkixWWEKsvLesnlshC34utjF3s8teC wYchb7yWWHbNP+7GIolGpjqf3p3E3KNL4DRtlFPzVmuTa6u3/gB5xk7ojO4ugTQg3jV3Lz GMjT+qebseOxbgI20LqOq24UHtHB9mSX/25JCMbJrhPcLJazVqIBON+sp6vttQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300688; a=rsa-sha256; cv=none; b=jhLDgDnA3MQ6kxtoN3R2SfXVa3K3fLRDZrWTep00MDlmpma31mS6i6btLgN10+Lw/mR0OI 4rGwx2j0EbWKtLc07THO8dAnIYz150WpNGSBU2RtlAvlqfv95T2sSCDsdWgqFU1MoO1jTY VnTa8TBRyuQsSbUT8KnzZWNnRLs45wOKHhgRlA1Pwu8iAb3HpPxhB+eLeBIPNB29f4STjQ yryXZwnXMZtmFV8izK7A2F5JaoBZ7hbgJ2YW84F1FONoVlx9t5Fe9UYoSR/6D71rLCPqve eR3IK/1WRweXRq4PnRkHqmGZcGJ1x4w2zOt+p7JRcyMlp68H/tacLIrvOxpAYw== 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 4dzC9D17TXz1R0r for ; Sun, 25 Jan 2026 00:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 855d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c4522efca63f - stable/15 - libthr/thread/thr_join.c: deduplicate backout_join() helper 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c4522efca63f6b72a7d7083998f8482feaab83a6 Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:48 +0000 Message-Id: <697562d0.855d.6b2e2a3f@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c4522efca63f6b72a7d7083998f8482feaab83a6 commit c4522efca63f6b72a7d7083998f8482feaab83a6 Author: Konstantin Belousov AuthorDate: 2026-01-18 12:23:14 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:35 +0000 libthr/thread/thr_join.c: deduplicate backout_join() helper (cherry picked from commit ce16be73707eedc798b26e0741dcd70d1168ac10) --- 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;