From patchwork Tue Dec 31 13:49:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gfleury X-Patchwork-Id: 103799 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 DCF383858C3A for ; Tue, 31 Dec 2024 13:51:15 +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 7AFD43858D21 for ; Tue, 31 Dec 2024 13:49:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7AFD43858D21 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 7AFD43858D21 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=1735652979; cv=none; b=gYrMbe1vi5tiYimmSb2C/JUN5SJWnP35uFGNKp6V4G1LJJWuK10e+wSNzLfLtPjyIG8JA3ADwCMSYvFQB2fh8QlkoQgg13JX33uUzBcay+nFvhkr7TI2cs/RhOeBrDpIVcqV/ON7OWPZntPwH110Oo3k+HNkQyqc/9nS4T9goTs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735652979; c=relaxed/simple; bh=wBgyRXEqRfcEPqc9Wf+YpXQ4+sh+ZZoxu9hnPNKLjLs=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=UfnSL9EmnpTOokVcWv5iD1Qa15Dk5aaaF70NmUPkgDl1IuApP8CHYtAzOxvar1Zh7CJZOEElxr+PXIFWSby5/kJuogzmee5dvwvFYoG9PrFTInskBWAIewr+6KTdV5prvCrFBpARlUMw8XAfg1QU8cpi+n+uVHNk5afEHGKlOeM= 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 6B4DF25BD8; Tue, 31 Dec 2024 14:49:38 +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 zm7pojB1MrKC; Tue, 31 Dec 2024 14:49:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735652971; bh=wBgyRXEqRfcEPqc9Wf+YpXQ4+sh+ZZoxu9hnPNKLjLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xfz9k2YkXd+/FLLhv4YlMOGQiaGVHlLceh+KNRxV5gDWmiOdWkSlmTsUiIekAXmHO tLr2lzgzg8x6OQXqNcIgrLopsiNsgbQpNn/8wFzMPW01cM+vYBCRj68hF3/RsfnfBO 6otCDSSTedNPFPfsPMqpE6STHpOUNfSb500hb0Fd9R2uclF6vTvRZe/lkGdveSrSMm G0YIT6ojCbE6dqDG27dU8q17mp+dnwQpSQdKAn98H27cUEmNcRiEuWL6tpKYgy8urm sXmHV4gQhMbTzXXvjR5MHO2EDoiD+8mfO87kRYkGQYAb/BH+Pmc0T86VpL75LBtyJZ nF0BAQj79ZRSw== From: gfleury To: libc-alpha@sourceware.org Cc: gfleury Subject: [PATCH 4/8] htl: move pthread_mutexattr_setprotocol into libc. Date: Tue, 31 Dec 2024 15:49:05 +0200 Message-Id: <20241231134909.1166440-5-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 | 4 ++++ sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.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, 20 insertions(+), 6 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 24d70241..9c3c0e74 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -58,7 +58,6 @@ libpthread-routines := \ pt-mutexattr-getpshared \ pt-mutexattr-gettype \ pt-mutexattr-setprioceiling \ - pt-mutexattr-setprotocol \ pt-mutexattr-setpshared \ pt-mutexattr-settype \ pt-mutexattr-getrobust \ @@ -201,6 +200,7 @@ routines := \ pt-mutexattr-destroy \ pt-mutexattr-getprotocol \ pt-mutexattr-init \ + pt-mutexattr-setprotocol \ pt-nthreads \ pt-pthread_self \ pt-self pt-equal \ diff --git a/htl/Versions b/htl/Versions index 5b451c63..f827f63c 100644 --- a/htl/Versions +++ b/htl/Versions @@ -41,6 +41,7 @@ libc { pthread_mutexattr_destroy; pthread_mutexattr_getprotocol; pthread_mutexattr_init; + pthread_mutexattr_setprotocol; pthread_sigmask; } @@ -182,7 +183,7 @@ libpthread { pthread_mutexattr_getprioceiling; pthread_mutexattr_getpshared; pthread_mutexattr_gettype; - pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; + pthread_mutexattr_setprioceiling; pthread_mutexattr_setpshared; pthread_mutexattr_settype; pthread_once; diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index 2b4b3c7b..87ee770b 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -44,7 +44,11 @@ extern int __pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind); extern int __pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr, int *__restrict __protocol); libc_hidden_proto (__pthread_mutexattr_getprotocol) +extern int __pthread_mutexattr_setprotocol(pthread_mutexattr_t *__attr, + int __protocol); +libc_hidden_proto (__pthread_mutexattr_setprotocol) #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-setprotocol.c b/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c index 96baeeef..8fd3d4bc 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c @@ -16,15 +16,16 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutexattr_setprotocol (pthread_mutexattr_t *attrp, int proto) +__pthread_mutexattr_setprotocol (pthread_mutexattr_t *attrp, int proto) { (void) attrp; return (proto == PTHREAD_PRIO_NONE @@ -32,3 +33,9 @@ pthread_mutexattr_setprotocol (pthread_mutexattr_t *attrp, int proto) : (proto != PTHREAD_PRIO_INHERIT && proto != PTHREAD_PRIO_PROTECT) ? EINVAL : ENOTSUP); } +libc_hidden_def (__pthread_mutexattr_setprotocol) +versioned_symbol (libc, __pthread_mutexattr_setprotocol, pthread_mutexattr_setprotocol, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_setprotocol,pthread_mutexattr_setprotocol, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 42898535..7f7c2279 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -66,6 +66,7 @@ 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_mutexattr_setprotocol F GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_setschedparam F GLIBC_2.12 pthread_sigmask F @@ -2525,6 +2526,7 @@ 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_mutexattr_setprotocol 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 b53ca950..182909a9 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -54,7 +54,6 @@ GLIBC_2.12 pthread_mutexattr_getprioceiling F GLIBC_2.12 pthread_mutexattr_getpshared F GLIBC_2.12 pthread_mutexattr_gettype F GLIBC_2.12 pthread_mutexattr_setprioceiling F -GLIBC_2.12 pthread_mutexattr_setprotocol F GLIBC_2.12 pthread_mutexattr_setpshared F GLIBC_2.12 pthread_mutexattr_settype F GLIBC_2.12 pthread_once F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 667c96e7..1e83c9f1 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1554,6 +1554,7 @@ 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_mutexattr_setprotocol F GLIBC_2.38 pthread_self F GLIBC_2.38 pthread_setcancelstate F GLIBC_2.38 pthread_setcanceltype F @@ -2214,6 +2215,7 @@ 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_mutexattr_setprotocol 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 24becc5a..85a08b87 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -79,7 +79,6 @@ GLIBC_2.38 pthread_mutexattr_getrobust F GLIBC_2.38 pthread_mutexattr_getrobust_np F GLIBC_2.38 pthread_mutexattr_gettype F GLIBC_2.38 pthread_mutexattr_setprioceiling F -GLIBC_2.38 pthread_mutexattr_setprotocol F GLIBC_2.38 pthread_mutexattr_setpshared F GLIBC_2.38 pthread_mutexattr_setrobust F GLIBC_2.38 pthread_mutexattr_setrobust_np F