From patchwork Tue Dec 31 13:49:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gfleury X-Patchwork-Id: 103801 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 E6CAE3858C2B for ; Tue, 31 Dec 2024 13:52:06 +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 7EE6F3858CDA for ; Tue, 31 Dec 2024 13:49:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7EE6F3858CDA 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 7EE6F3858CDA 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=1735652983; cv=none; b=Ktfb5/CJ4JJtr0s1v9apcBua6+8xEeffJN8JUD6oC4QVT26IMBJcCai1ITAq/fpuLDfM8iRgi7bokCXhQgG8+BgAEvHPsI8McxDlGybeXmf8usIO2hospSDErHdGj/7iVgcdKK7wIScqSQph0Hg4Xwo8JWPhIC+YS0Ownkxhcdc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735652983; c=relaxed/simple; bh=UBB6VBBl4XC8aSC0O0LzyEFW4TETPN0LrgUDF+dcvfc=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=LgZJZQYYGmoj+NIURfFnIs/DtjRVC41Fsw6jC0QpzQYSC5zcqd8Iu/GuBpN06NOqDZXyTcIPOKGWVtcajt9oh/r75kfPPYXsU8tigWxmKaCwHoOA9QIwgD1AdNpGfZelK9D+kFTOz4U28zzuRNN0HuH3014tFirJGLOFaTggrCA= 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 2DB7B25770; Tue, 31 Dec 2024 14:49:41 +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 fICQ7L9RVdo9; Tue, 31 Dec 2024 14:49:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735652976; bh=UBB6VBBl4XC8aSC0O0LzyEFW4TETPN0LrgUDF+dcvfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZO9YCjz+YAXkVdB4MT9r8HsqTsVf64Gzp/ex/8V+DT79qTypPS+urB05yPoWJ1Inc b2Q9MuE62aBQFKkqro9J4Vo/acp8qk3c/Z0pNY0Ypnqauj3fzk8QzRflI41fwOkqst ndvp//8eMR2+WBo2TyN13qtlnqbqsIkE/nfwrS8ZqRDgffNOnMAQodOw5X9Z3PK+zO FBTVCl11SIJwjDWhrr9IHJePotloHRgX+Nv7SCF9HraaQJ6e0cT9JkGeAn7yNOCj+p 6ENrGaUnczMNVV5WrxAQxZBm37vZr8Dg3QQfiVfU3fFBwkOtuKTWmTnRRHk1YfUzdt UorWt1S6aQ34w== From: gfleury To: libc-alpha@sourceware.org Cc: gfleury Subject: [PATCH 8/8] htl: move pthread_mutexattr_setprioceiling, pthread_mutexattr_getprioceiling into libc. Date: Tue, 31 Dec 2024 15:49:09 +0200 Message-Id: <20241231134909.1166440-9-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 | 4 ++-- htl/Versions | 5 ++--- sysdeps/htl/pthreadP.h | 6 ++++++ sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c | 10 ++++++++-- sysdeps/mach/hurd/htl/pt-mutexattr-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, 34 insertions(+), 13 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 5b4615a3..51784461 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -54,8 +54,6 @@ libpthread-routines := \ pt-setcanceltype \ pt-testcancel \ pt-cancel \ - pt-mutexattr-getprioceiling \ - pt-mutexattr-setprioceiling \ pt-mutex-init \ pt-mutex-destroy \ pt-mutex-lock \ @@ -192,11 +190,13 @@ routines := \ pt-getschedparam \ pt-mutex-checklocked \ pt-mutexattr-destroy \ + pt-mutexattr-getprioceiling \ pt-mutexattr-getprotocol \ pt-mutexattr-getpshared \ pt-mutexattr-getrobust \ pt-mutexattr-gettype \ pt-mutexattr-init \ + pt-mutexattr-setprioceiling \ pt-mutexattr-setprotocol \ pt-mutexattr-setpshared \ pt-mutexattr-setrobust \ diff --git a/htl/Versions b/htl/Versions index e3530acc..23e43a01 100644 --- a/htl/Versions +++ b/htl/Versions @@ -39,10 +39,12 @@ libc { pthread_condattr_setclock; pthread_condattr_setpshared; pthread_mutexattr_destroy; + pthread_mutexattr_getprioceiling; pthread_mutexattr_getprotocol; pthread_mutexattr_getpshared; pthread_mutexattr_gettype; pthread_mutexattr_init; + pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_settype; @@ -188,9 +190,6 @@ libpthread { pthread_mutex_timedlock; pthread_mutex_transfer_np; pthread_mutex_trylock; pthread_mutex_unlock; - pthread_mutexattr_getprioceiling; - pthread_mutexattr_setprioceiling; - pthread_once; pthread_rwlock_destroy; pthread_rwlock_init; pthread_rwlock_rdlock; diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index 55e4dd38..8839dd34 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -67,6 +67,12 @@ libc_hidden_proto (__pthread_mutexattr_setrobust) #endif #ifdef __USE_UNIX98 +extern int __pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *__restrict __attr, + int *__restrict __prioceiling); +libc_hidden_proto (__pthread_mutexattr_getprioceiling) +extern int __pthread_mutexattr_setprioceiling(pthread_mutexattr_t *__attr, + int __prioceiling); +libc_hidden_proto (__pthread_mutexattr_setprioceiling) extern int __pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr, int *__restrict __protocol); libc_hidden_proto (__pthread_mutexattr_getprotocol) diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c b/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c index 375b85a5..5b42201a 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-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_mutexattr_getprioceiling (const pthread_mutexattr_t *ap, int *clp) +__pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *ap, int *clp) { (void) ap; (void) clp; return ENOSYS; } +libc_hidden_def (__pthread_mutexattr_getprioceiling) +versioned_symbol (libc, __pthread_mutexattr_getprioceiling, pthread_mutexattr_getprioceiling, GLIBC_2_41); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_getprioceiling,pthread_mutexattr_getprioceiling, GLIBC_2_12); +#endif stub_warning (pthread_mutexattr_getprioceiling) diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c b/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c index ce0c7c0e..47bef926 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.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_mutexattr_setprioceiling (pthread_mutexattr_t *attrp, int cl) +__pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attrp, int cl) { (void) attrp; (void) cl; return ENOSYS; } +libc_hidden_def (__pthread_mutexattr_setprioceiling) +versioned_symbol (libc, __pthread_mutexattr_setprioceiling, pthread_mutexattr_setprioceiling, GLIBC_2_41); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_setprioceiling,pthread_mutexattr_setprioceiling, GLIBC_2_12); +#endif stub_warning (pthread_mutexattr_setprioceiling) diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 76275fc5..2da43f93 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -64,10 +64,12 @@ 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_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_init 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 @@ -2533,11 +2535,13 @@ 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_getprioceiling F GLIBC_2.41 pthread_mutexattr_getprotocol F GLIBC_2.41 pthread_mutexattr_getpshared F GLIBC_2.41 pthread_mutexattr_getrobust F GLIBC_2.41 pthread_mutexattr_getrobust_np F GLIBC_2.41 pthread_mutexattr_gettype F +GLIBC_2.41 pthread_mutexattr_setprioceiling F GLIBC_2.41 pthread_mutexattr_setprotocol F GLIBC_2.41 pthread_mutexattr_setpshared F GLIBC_2.41 pthread_mutexattr_setrobust F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index bc48c002..b925871a 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -50,8 +50,6 @@ GLIBC_2.12 pthread_mutex_timedlock F 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_setprioceiling F GLIBC_2.12 pthread_once F GLIBC_2.12 pthread_rwlock_destroy F GLIBC_2.12 pthread_rwlock_init F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 91ba8779..6f164486 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1552,12 +1552,14 @@ 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_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 GLIBC_2.38 pthread_mutexattr_gettype F GLIBC_2.38 pthread_mutexattr_init 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 @@ -2222,11 +2224,13 @@ 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_getprioceiling F GLIBC_2.41 pthread_mutexattr_getprotocol F GLIBC_2.41 pthread_mutexattr_getpshared F GLIBC_2.41 pthread_mutexattr_getrobust F GLIBC_2.41 pthread_mutexattr_getrobust_np F GLIBC_2.41 pthread_mutexattr_gettype F +GLIBC_2.41 pthread_mutexattr_setprioceiling F GLIBC_2.41 pthread_mutexattr_setprotocol F GLIBC_2.41 pthread_mutexattr_setpshared F GLIBC_2.41 pthread_mutexattr_setrobust F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index b382b484..608901fb 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -73,8 +73,6 @@ GLIBC_2.38 pthread_mutex_timedlock F 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_setprioceiling F GLIBC_2.38 pthread_once F GLIBC_2.38 pthread_rwlock_clockrdlock F GLIBC_2.38 pthread_rwlock_clockwrlock F