From patchwork Tue Jan 7 00:03:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 104200 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9C4263858C98 for ; Tue, 7 Jan 2025 00:03:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9C4263858C98 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 026023858C98 for ; Tue, 7 Jan 2025 00:03:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 026023858C98 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 026023858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736208197; cv=none; b=nxoLGK8engZZZkvolewQ0v/lKGxQCgdI37DUNlFPWaHi+uIdR9uUHUmH2kyt3DGlTiWFKUEVQlLhKA0e+7zyDFVQnPofuiieM+VBz/Qny7C7tidQuOvTRtXKbH0jzALssND/FcdoNO+XxWU5uoF8X8TnJ/A5evs9kGRMayuNDEs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1736208197; c=relaxed/simple; bh=WwjHwbuFdrXwMGu2hPIsDipnD6oZUwKVlu/Pw+Jks3A=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=kYcoN+NhnPH85WouLO2eh3nhTle5S4Dpv9XxdQ4RY0z6N2Dbqn5EB5nuCTfu3kKtSGA8C6XMpmfSiuloww7+/ecv0Tl0DRa22ABComDcbxZAis1GfIYIqbhyQIonljBwuwC5hJ/GheLepeshLkdaFKw2/uNyG54STutw4fxAArU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 026023858C98 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 0BB45A0405; Tue, 7 Jan 2025 01:03:16 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zCrFrJzKHXTD; Tue, 7 Jan 2025 01:03:15 +0100 (CET) Received: from begin.home (aamiens-653-1-40-48.w83-192.abo.wanadoo.fr [83.192.199.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 09685A03F4; Tue, 7 Jan 2025 01:03:15 +0100 (CET) Received: from samy by begin.home with local (Exim 4.98) (envelope-from ) id 1tUx3y-0000000HOot-1Bk3; Tue, 07 Jan 2025 01:03:14 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited] htl: Fix making pthread_join check timeout value Date: Tue, 7 Jan 2025 01:03:14 +0100 Message-ID: <20250107000314.4146976-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org --- htl/pt-join.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/htl/pt-join.c b/htl/pt-join.c index 5ecd0c7eb2..4e4798a476 100644 --- a/htl/pt-join.c +++ b/htl/pt-join.c @@ -49,12 +49,18 @@ __pthread_join_common (pthread_t thread, void **status, int try, /* Rely on pthread_cond_wait being a cancellation point to make pthread_join one too. */ - while (pthread->state == PTHREAD_JOINABLE && err != ETIMEDOUT) + while (pthread->state == PTHREAD_JOINABLE && err != ETIMEDOUT && err != EINVAL) err = __pthread_cond_clockwait (&pthread->state_cond, &pthread->state_lock, clockid, abstime); pthread_cleanup_pop (0); + + if (err == EINVAL) + { + __pthread_mutex_unlock (&pthread->state_lock); + return err; + } } switch (pthread->state)