From patchwork Sat Mar 14 23:05:53 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 131748 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 68DBF4B1A377 for ; Sat, 14 Mar 2026 23:06:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 68DBF4B1A377 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 D0C194BB58A1 for ; Sat, 14 Mar 2026 23:05:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D0C194BB58A1 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 D0C194BB58A1 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=1773529557; cv=none; b=armZvkAI4vfP13bfWOjxeuxg3c0tt86VAT2gdzgMr//UU37zDOiUCiKPhSnJo/fYsaqiHjs1rB3DuQo/PrDRvEk05cVRuyzxlNKJxUKApYc2UJp37l3yAEe8IrZAbppKneNccBdxNUtP4IBWXmCTRehp5A3p2iqc2i3ZhUkERGw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1773529557; c=relaxed/simple; bh=VFntxmShbwnt3RUWxbrZRv+0QhTD2g7DUCIysddNvD8=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=usqpAwRuZhpXSsk63t5rMzWwzHKNu4r8r6WxPDNMHOpdSLej1oGg0BLwY3307UpZvLEc84X3Gwua6wjv/Qbl/6kiJ8fj5RDFcknsG32FSWsbqgUjW008RwN3G196m+huRCnqbIAuYsQbE3w6/e44eZ8ZROXZljHyB2+J/mPS47Y= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D0C194BB58A1 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id C1554A19CF; Sun, 15 Mar 2026 00:05:55 +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 FOrcEhUYujLl; Sun, 15 Mar 2026 00:05:55 +0100 (CET) Received: from end (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 358F2A1CFC; Sun, 15 Mar 2026 00:05:54 +0100 (CET) Received: from samy by end with local (Exim 4.99.1) (envelope-from ) id 1w1Y3N-0000000Gbf3-3bwE; Sun, 15 Mar 2026 00:05:53 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited 2/2] htl: Use pthread_rwlock for libc_rwlock Date: Sun, 15 Mar 2026 00:05:53 +0100 Message-ID: <20260314230553.3957622-3-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260314230553.3957622-1-samuel.thibault@ens-lyon.org> References: <20260314230553.3957622-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, 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 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 Like nptl does, so we really get rwlock behavior. --- sysdeps/htl/libc-lockP.h | 14 ++++++++++++++ sysdeps/mach/libc-lock.h | 10 ---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h index a88eea4344..e20e40f254 100644 --- a/sysdeps/htl/libc-lockP.h +++ b/sysdeps/htl/libc-lockP.h @@ -21,6 +21,20 @@ #include +typedef pthread_rwlock_t __libc_rwlock_t; + +#define __libc_rwlock_define(CLASS,NAME) \ + CLASS __libc_rwlock_t NAME; +#define __libc_rwlock_define_initialized(CLASS,NAME) \ + CLASS __libc_rwlock_t NAME = PTHREAD_RWLOCK_INITIALIZER; +#define __libc_rwlock_init(NAME) __pthread_rwlock_init (&(NAME), NULL) +#define __libc_rwlock_fini(NAME) ((void) 0) +#define __libc_rwlock_rdlock(NAME) __pthread_rwlock_rdlock (&(NAME)) +#define __libc_rwlock_wrlock(NAME) __pthread_rwlock_wrlock (&(NAME)) +#define __libc_rwlock_tryrdlock(NAME) __pthread_rwlock_tryrdlock (&(NAME)) +#define __libc_rwlock_trywrlock(NAME) __pthread_rwlock_trywrlock (&(NAME)) +#define __libc_rwlock_unlock(NAME) __pthread_rwlock_unlock (&(NAME)) + /* If we check for a weakly referenced symbol and then perform a normal jump to it te code generated for some platforms in case of PIC is unnecessarily slow. What would happen is that the function diff --git a/sysdeps/mach/libc-lock.h b/sysdeps/mach/libc-lock.h index ddeae544f4..c5c67ccf9d 100644 --- a/sysdeps/mach/libc-lock.h +++ b/sysdeps/mach/libc-lock.h @@ -156,16 +156,6 @@ typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; #define __mach_rwlock_trywrlock __libc_lock_trylock #define __mach_rwlock_unlock __libc_lock_unlock -#define __libc_rwlock_define __libc_lock_define -#define __libc_rwlock_define_initialized __libc_lock_define_initialized -#define __libc_rwlock_init __libc_lock_init -#define __libc_rwlock_fini __libc_lock_fini -#define __libc_rwlock_rdlock __libc_lock_lock -#define __libc_rwlock_wrlock __libc_lock_lock -#define __libc_rwlock_tryrdlock __libc_lock_trylock -#define __libc_rwlock_trywrlock __libc_lock_trylock -#define __libc_rwlock_unlock __libc_lock_unlock - struct __libc_cleanup_frame { void (*__fct) (void *);