From patchwork Wed Jan 29 01:33:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 105585 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 1FB393857C68 for ; Wed, 29 Jan 2025 01:38:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1FB393857C68 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 0200C3857C68 for ; Wed, 29 Jan 2025 01:33:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0200C3857C68 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 0200C3857C68 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=1738114426; cv=none; b=bbl2uIxK/o5kFxYwfplr1CcjZ7iWtDXutfadqUyNn2QHMcPm/R/HpU5Qvrdgy2q2KiQc3lq+rkNvUXMJV9v8b3r6RI1msWsVWAjP+7SU2G1XvBGRVxlUOH26tK0TJE0E4Pu+/ZM8HY41tLSQQSoIagGo6xXl9iRJb1yw8mAoj9Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1738114426; c=relaxed/simple; bh=U69XHQPk5c6iKtzp3IHdfC1SFYrsgUTtOT2XxU55dyA=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=RZh4c1Z5bKWhN1RC/nw8a/NHM4X8H35VuvUy4/JqjMcq2O+Fgt4+PHb/t974hdN1v6sx+2yLSNH+eUOzYrpJhAb8OVN+NLk6wIqYjoV8XbvqEBN4jQtd/2BO3OIJfMPYq2B6+dK2M36oYGcj8jxJ22bHK2BT8PZrYIzgz/2xP2o= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0200C3857C68 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 87C6AA03E5; Wed, 29 Jan 2025 02:33:44 +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 mpWpr3WGYkKr; Wed, 29 Jan 2025 02:33:44 +0100 (CET) Received: from begin (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 39E6AA19AA; Wed, 29 Jan 2025 02:33:44 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tcwxb-0000000AtU0-33nT; Wed, 29 Jan 2025 02:33:43 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd, commited 4/7] htl: move pthread_mutex_getprioceiling, pthread_mutex_setprioceiling into libc Date: Wed, 29 Jan 2025 02:33:39 +0100 Message-ID: <20250129013342.2596522-5-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250129013342.2596522-1-samuel.thibault@ens-lyon.org> References: <20250129013342.2596522-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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 From: gfleury Message-ID: <20250103103750.870897-4-gfleury@disroot.org> --- htl/Makefile | 4 ++-- htl/Versions | 7 +++++-- sysdeps/htl/pthreadP.h | 6 ++++++ sysdeps/mach/hurd/htl/pt-mutex-getprioceiling.c | 10 ++++++++-- sysdeps/mach/hurd/htl/pt-mutex-setprioceiling.c | 10 ++++++++-- sysdeps/mach/hurd/i386/libc.abilist | 4 ++++ sysdeps/mach/hurd/i386/libpthread.abilist | 2 -- sysdeps/mach/hurd/x86_64/libc.abilist | 4 ++++ sysdeps/mach/hurd/x86_64/libpthread.abilist | 2 -- 9 files changed, 37 insertions(+), 12 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 0d3e78dee5..f7e12983d2 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -56,8 +56,6 @@ libpthread-routines := \ pt-cancel \ pt-mutex-destroy \ pt-mutex-transfer-np \ - pt-mutex-getprioceiling \ - pt-mutex-setprioceiling \ pt-mutex-consistent \ pt-rwlock-attr \ pt-rwlockattr-init \ @@ -184,8 +182,10 @@ routines := \ pt-condattr-setpshared \ pt-getschedparam \ pt-mutex-checklocked \ + pt-mutex-getprioceiling \ pt-mutex-init \ pt-mutex-lock \ + pt-mutex-setprioceiling \ pt-mutex-timedlock \ pt-mutex-trylock \ pt-mutex-unlock \ diff --git a/htl/Versions b/htl/Versions index 757cefef61..9c016bc6cf 100644 --- a/htl/Versions +++ b/htl/Versions @@ -38,8 +38,10 @@ libc { pthread_condattr_getpshared; pthread_condattr_setclock; pthread_condattr_setpshared; + pthread_mutex_getprioceiling; pthread_mutex_init; pthread_mutex_lock; + pthread_mutex_setprioceiling; pthread_mutex_timedlock; pthread_mutex_trylock; pthread_mutex_unlock; @@ -117,6 +119,8 @@ libc { } GLIBC_2.42 { + pthread_mutex_getprioceiling; + pthread_mutex_setprioceiling; pthread_mutex_trylock; } @@ -210,8 +214,7 @@ libpthread { pthread_kill; __pthread_kill; - pthread_mutex_destroy; pthread_mutex_getprioceiling; - pthread_mutex_setprioceiling; + pthread_mutex_destroy; pthread_mutex_transfer_np; pthread_once; diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index a2a0a932b7..e41cb4c85d 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -39,6 +39,12 @@ libc_hidden_proto (__pthread_mutex_clocklock) extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex); extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); libc_hidden_proto (__pthread_mutex_lock) +extern int __pthread_mutex_getprioceiling (const pthread_mutex_t *__mutex, + int *__prioceiling); +libc_hidden_proto (__pthread_mutex_getprioceiling) +extern int __pthread_mutex_setprioceiling (pthread_mutex_t *__mutex, + int __prio, int *__oldprio); +libc_hidden_proto (__pthread_mutex_setprioceiling) extern int __pthread_mutex_trylock (pthread_mutex_t *_mutex); libc_hidden_proto (__pthread_mutex_trylock) extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex, diff --git a/sysdeps/mach/hurd/htl/pt-mutex-getprioceiling.c b/sysdeps/mach/hurd/htl/pt-mutex-getprioceiling.c index 7a8feadce7..27ea03ee60 100644 --- a/sysdeps/mach/hurd/htl/pt-mutex-getprioceiling.c +++ b/sysdeps/mach/hurd/htl/pt-mutex-getprioceiling.c @@ -16,19 +16,25 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutex_getprioceiling (const pthread_mutex_t *mtxp, int *clp) +__pthread_mutex_getprioceiling (const pthread_mutex_t *mtxp, int *clp) { (void) mtxp; (void) clp; return ENOSYS; } +libc_hidden_def (__pthread_mutex_getprioceiling) +versioned_symbol (libc, __pthread_mutex_getprioceiling, pthread_mutex_getprioceiling, GLIBC_2_42); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_mutex_getprioceiling,pthread_mutex_getprioceiling, GLIBC_2_12); +#endif stub_warning (pthread_mutex_getprioceiling) diff --git a/sysdeps/mach/hurd/htl/pt-mutex-setprioceiling.c b/sysdeps/mach/hurd/htl/pt-mutex-setprioceiling.c index 6ccce83340..5064e2f575 100644 --- a/sysdeps/mach/hurd/htl/pt-mutex-setprioceiling.c +++ b/sysdeps/mach/hurd/htl/pt-mutex-setprioceiling.c @@ -16,20 +16,26 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutex_setprioceiling (pthread_mutex_t *mtxp, int cl, int *prp) +__pthread_mutex_setprioceiling (pthread_mutex_t *mtxp, int cl, int *prp) { (void) mtxp; (void) cl; (void) prp; return ENOSYS; } +libc_hidden_def (__pthread_mutex_setprioceiling) +versioned_symbol (libc, __pthread_mutex_setprioceiling, pthread_mutex_setprioceiling, GLIBC_2_42); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_mutex_setprioceiling,pthread_mutex_setprioceiling, GLIBC_2_12); +#endif stub_warning (pthread_mutex_setprioceiling) diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index aba93a281b..c980b46bca 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -63,8 +63,10 @@ GLIBC_2.12 pthread_condattr_setclock F GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F +GLIBC_2.12 pthread_mutex_getprioceiling F GLIBC_2.12 pthread_mutex_init F GLIBC_2.12 pthread_mutex_lock F +GLIBC_2.12 pthread_mutex_setprioceiling F GLIBC_2.12 pthread_mutex_timedlock F GLIBC_2.12 pthread_mutex_trylock F GLIBC_2.12 pthread_mutex_unlock F @@ -2554,6 +2556,8 @@ GLIBC_2.41 pthread_mutexattr_setrobust F GLIBC_2.41 pthread_mutexattr_setrobust_np F GLIBC_2.41 pthread_mutexattr_settype F GLIBC_2.41 pthread_sigmask F +GLIBC_2.42 pthread_mutex_getprioceiling F +GLIBC_2.42 pthread_mutex_setprioceiling F GLIBC_2.42 pthread_mutex_trylock 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 8c53b8d0ee..0eb452eb02 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -42,8 +42,6 @@ GLIBC_2.12 pthread_key_create F GLIBC_2.12 pthread_key_delete F GLIBC_2.12 pthread_kill F GLIBC_2.12 pthread_mutex_destroy F -GLIBC_2.12 pthread_mutex_getprioceiling F -GLIBC_2.12 pthread_mutex_setprioceiling F GLIBC_2.12 pthread_mutex_transfer_np F GLIBC_2.12 pthread_once F GLIBC_2.12 pthread_rwlock_destroy F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 2251371451..bdb89fb41d 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1549,8 +1549,10 @@ GLIBC_2.38 pthread_exit F GLIBC_2.38 pthread_getschedparam F GLIBC_2.38 pthread_mutex_clocklock F GLIBC_2.38 pthread_mutex_destroy F +GLIBC_2.38 pthread_mutex_getprioceiling F GLIBC_2.38 pthread_mutex_init F GLIBC_2.38 pthread_mutex_lock F +GLIBC_2.38 pthread_mutex_setprioceiling F GLIBC_2.38 pthread_mutex_timedlock F GLIBC_2.38 pthread_mutex_trylock F GLIBC_2.38 pthread_mutex_unlock F @@ -2240,6 +2242,8 @@ GLIBC_2.41 pthread_mutexattr_setrobust F GLIBC_2.41 pthread_mutexattr_setrobust_np F GLIBC_2.41 pthread_mutexattr_settype F GLIBC_2.41 pthread_sigmask F +GLIBC_2.42 pthread_mutex_getprioceiling F +GLIBC_2.42 pthread_mutex_setprioceiling F GLIBC_2.42 pthread_mutex_trylock 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 bd5e12adcc..faeac21d94 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -64,8 +64,6 @@ GLIBC_2.38 pthread_kill F GLIBC_2.38 pthread_mutex_consistent F GLIBC_2.38 pthread_mutex_consistent_np F GLIBC_2.38 pthread_mutex_destroy F -GLIBC_2.38 pthread_mutex_getprioceiling F -GLIBC_2.38 pthread_mutex_setprioceiling F GLIBC_2.38 pthread_mutex_transfer_np F GLIBC_2.38 pthread_once F GLIBC_2.38 pthread_rwlock_clockrdlock F