From 396048fa5a41be38d196e03175ccc4bd318f4fb6 Mon Sep 17 00:00:00 2001 From: gfleury Date: Tue, 31 Dec 2024 15:49:09 +0200 Subject: [PATCH] htl: move pthread_mutexattr_setprioceiling, pthread_mutexattr_getprioceiling into libc. Message-ID: <20241231134909.1166440-9-gfleury@disroot.org> --- htl/Makefile | 4 ++-- htl/Versions | 7 ++++--- sysdeps/htl/pthreadP.h | 7 +++++++ 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, 37 insertions(+), 13 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index a46dcff204..551d4c01d3 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 42e3ebebf0..f1393ebe34 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; @@ -94,10 +96,12 @@ libc { pthread_condattr_getpshared; pthread_condattr_setclock; pthread_condattr_setpshared; + pthread_mutexattr_getprioceiling; pthread_mutexattr_getprotocol; pthread_mutexattr_getpshared; pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np; pthread_mutexattr_gettype; + pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np; @@ -196,9 +200,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 d08a0ca7dd..20dd5a1cc5 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -62,6 +62,13 @@ extern int __pthread_mutexattr_setrobust (pthread_mutexattr_t *__attr, int __robustness); libc_hidden_proto (__pthread_mutexattr_setrobust) +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 8848287a45..cb46251868 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 a15593ac1b..8515235d88 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 8e364b14c6..40f35ee047 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 bc48c0023d..b925871a0b 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 05a4a8cf28..aaf55cbaf4 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 b382b4843a..608901fb00 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