From patchwork Tue Dec 31 13:49:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gfleury X-Patchwork-Id: 103797 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 DD769385840D for ; Tue, 31 Dec 2024 13:50:02 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id 954443858D39 for ; Tue, 31 Dec 2024 13:49:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 954443858D39 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=disroot.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 954443858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=178.21.23.139 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735652975; cv=none; b=WLXd5ZnhpteDGCRTAo0ZS2T0f8Ox5V2VJZHPG+8QCZfMZc7YgmBYYIArc4DEIUv/vqbj+ektCQIy1kGdOoo+gic/8rBNVaZNNBdIZ+AQMHqBpOHBYjfORehGEUMDr6UGxXbnK5BnIXlOYFgobWK/NgjQ6QeZL+nblUMJeB+JYT4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735652975; c=relaxed/simple; bh=1ENR6r4KPgHvlnR+V9eE+KNvvBgJ691udbMA90MSOhM=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=uVQyvpRVcvxAvEq58brTbly94lFirtpkqFWnOPFN1Uun8rJ0OK9iOHCXLp3MNvuewzGe/nlBoqAtB5LJKejhjBsTYH5R7tGbG2l0TPE/BcSJpv921akxNIpFLsuEzPBwhHbB/NqvrTlb+ZWmHDkykNE/mhY6kurNhdEde3t/AKg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2E74725C79; Tue, 31 Dec 2024 14:49:34 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Ooj_5ucpLDVc; Tue, 31 Dec 2024 14:49:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735652969; bh=1ENR6r4KPgHvlnR+V9eE+KNvvBgJ691udbMA90MSOhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GvrqSv/N2cLud4wj/hwu5SXZhc6tGtQ2lnVFSoA5T/X7LiENeEL95wDgthDObuEbc rrRfaULxZ7x7zIbPMvSzzVOID1dvnp2cKW5cZnfTzkxyKTSji6gU3uy2RYvepbr4+I lBtVHX25gbVeExhRxL1+TQksfJwEfwR4EHsc0XXDoqax5EGkZRrDomFnux5uQLjzNe fczalr1svIZTA8mBwvUh00jmMKaal8qP0Ljim9Ez9PjxbNXhaJlhg2Vn9nEsH2na4G k06grMw+nk04q594VobW/pcei3R4piXZuEaw3/38Ko5TgnwHVvPs/MOeyhBc+ORcqL 3CHcRwl8Cyvjg== From: gfleury To: libc-alpha@sourceware.org Cc: gfleury Subject: [PATCH 3/8] htl: move pthread_mutexattr_getprotocol into libc. Date: Tue, 31 Dec 2024 15:49:04 +0200 Message-Id: <20241231134909.1166440-4-gfleury@disroot.org> In-Reply-To: <20241231134909.1166440-1-gfleury@disroot.org> References: <20241231134909.1166440-1-gfleury@disroot.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, 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/Makefile | 2 +- htl/Versions | 3 ++- sysdeps/htl/pthreadP.h | 5 +++++ sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c | 11 +++++++++-- sysdeps/mach/hurd/i386/libc.abilist | 2 ++ sysdeps/mach/hurd/i386/libpthread.abilist | 1 - sysdeps/mach/hurd/x86_64/libc.abilist | 2 ++ sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 - 8 files changed, 21 insertions(+), 6 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 1555da73..24d70241 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -55,7 +55,6 @@ libpthread-routines := \ pt-testcancel \ pt-cancel \ pt-mutexattr-getprioceiling \ - pt-mutexattr-getprotocol \ pt-mutexattr-getpshared \ pt-mutexattr-gettype \ pt-mutexattr-setprioceiling \ @@ -200,6 +199,7 @@ routines := \ pt-getschedparam \ pt-mutex-checklocked \ pt-mutexattr-destroy \ + pt-mutexattr-getprotocol \ pt-mutexattr-init \ pt-nthreads \ pt-pthread_self \ diff --git a/htl/Versions b/htl/Versions index d3ee842e..5b451c63 100644 --- a/htl/Versions +++ b/htl/Versions @@ -39,6 +39,7 @@ libc { pthread_condattr_setclock; pthread_condattr_setpshared; pthread_mutexattr_destroy; + pthread_mutexattr_getprotocol; pthread_mutexattr_init; pthread_sigmask; } @@ -179,7 +180,7 @@ libpthread { pthread_mutex_trylock; pthread_mutex_unlock; pthread_mutexattr_getprioceiling; - pthread_mutexattr_getprotocol; pthread_mutexattr_getpshared; + pthread_mutexattr_getpshared; pthread_mutexattr_gettype; pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_settype; diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index 15ce6a6a..2b4b3c7b 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -40,6 +40,11 @@ extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex, extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); extern int __pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind); +#ifdef __USE_UNIX98 +extern int __pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr, + int *__restrict __protocol); +libc_hidden_proto (__pthread_mutexattr_getprotocol) +#endif extern int __pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *cond_attr); libc_hidden_proto (__pthread_cond_init) diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c b/sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c index 075db470..5ef21fff 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c @@ -16,16 +16,23 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attrp, int *ptp) +__pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attrp, int *ptp) { *ptp = attrp->__protocol; return 0; } +libc_hidden_def (__pthread_mutexattr_getprotocol) +versioned_symbol (libc, __pthread_mutexattr_getprotocol, pthread_mutexattr_getprotocol, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_getprotocol,pthread_mutexattr_getprotocol, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 69af1452..42898535 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -64,6 +64,7 @@ GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_mutexattr_destroy F +GLIBC_2.12 pthread_mutexattr_getprotocol F GLIBC_2.12 pthread_mutexattr_init F GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_setschedparam F @@ -2523,6 +2524,7 @@ GLIBC_2.41 pthread_condattr_getclock F GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F +GLIBC_2.41 pthread_mutexattr_getprotocol F GLIBC_2.41 pthread_sigmask F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 0fd3e538..b53ca950 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -51,7 +51,6 @@ GLIBC_2.12 pthread_mutex_transfer_np F GLIBC_2.12 pthread_mutex_trylock F GLIBC_2.12 pthread_mutex_unlock F GLIBC_2.12 pthread_mutexattr_getprioceiling F -GLIBC_2.12 pthread_mutexattr_getprotocol F GLIBC_2.12 pthread_mutexattr_getpshared F GLIBC_2.12 pthread_mutexattr_gettype F GLIBC_2.12 pthread_mutexattr_setprioceiling F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 52e698f8..667c96e7 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1552,6 +1552,7 @@ GLIBC_2.38 pthread_mutex_init F GLIBC_2.38 pthread_mutex_lock F GLIBC_2.38 pthread_mutex_unlock F GLIBC_2.38 pthread_mutexattr_destroy F +GLIBC_2.38 pthread_mutexattr_getprotocol F GLIBC_2.38 pthread_mutexattr_init F GLIBC_2.38 pthread_self F GLIBC_2.38 pthread_setcancelstate F @@ -2212,6 +2213,7 @@ GLIBC_2.41 pthread_condattr_getclock F GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F +GLIBC_2.41 pthread_mutexattr_getprotocol F GLIBC_2.41 pthread_sigmask F HURD_CTHREADS_0.3 __cthread_getspecific F HURD_CTHREADS_0.3 __cthread_keycreate F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 90ea26b2..24becc5a 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -74,7 +74,6 @@ GLIBC_2.38 pthread_mutex_transfer_np F GLIBC_2.38 pthread_mutex_trylock F GLIBC_2.38 pthread_mutex_unlock F GLIBC_2.38 pthread_mutexattr_getprioceiling F -GLIBC_2.38 pthread_mutexattr_getprotocol F GLIBC_2.38 pthread_mutexattr_getpshared F GLIBC_2.38 pthread_mutexattr_getrobust F GLIBC_2.38 pthread_mutexattr_getrobust_np F