htl: move pthread_mutexattr_setprioceiling, pthread_mutexattr_getprioceiling into libc.

Message-ID: <20241231134909.1166440-9-gfleury@disroot.org>
This commit is contained in:
gfleury 2024-12-31 15:49:09 +02:00 committed by Samuel Thibault
parent 4371b11c86
commit 396048fa5a
9 changed files with 37 additions and 13 deletions

View file

@ -54,8 +54,6 @@ libpthread-routines := \
pt-setcanceltype \ pt-setcanceltype \
pt-testcancel \ pt-testcancel \
pt-cancel \ pt-cancel \
pt-mutexattr-getprioceiling \
pt-mutexattr-setprioceiling \
pt-mutex-init \ pt-mutex-init \
pt-mutex-destroy \ pt-mutex-destroy \
pt-mutex-lock \ pt-mutex-lock \
@ -192,11 +190,13 @@ routines := \
pt-getschedparam \ pt-getschedparam \
pt-mutex-checklocked \ pt-mutex-checklocked \
pt-mutexattr-destroy \ pt-mutexattr-destroy \
pt-mutexattr-getprioceiling \
pt-mutexattr-getprotocol \ pt-mutexattr-getprotocol \
pt-mutexattr-getpshared \ pt-mutexattr-getpshared \
pt-mutexattr-getrobust \ pt-mutexattr-getrobust \
pt-mutexattr-gettype \ pt-mutexattr-gettype \
pt-mutexattr-init \ pt-mutexattr-init \
pt-mutexattr-setprioceiling \
pt-mutexattr-setprotocol \ pt-mutexattr-setprotocol \
pt-mutexattr-setpshared \ pt-mutexattr-setpshared \
pt-mutexattr-setrobust \ pt-mutexattr-setrobust \

View file

@ -39,10 +39,12 @@ libc {
pthread_condattr_setclock; pthread_condattr_setclock;
pthread_condattr_setpshared; pthread_condattr_setpshared;
pthread_mutexattr_destroy; pthread_mutexattr_destroy;
pthread_mutexattr_getprioceiling;
pthread_mutexattr_getprotocol; pthread_mutexattr_getprotocol;
pthread_mutexattr_getpshared; pthread_mutexattr_getpshared;
pthread_mutexattr_gettype; pthread_mutexattr_gettype;
pthread_mutexattr_init; pthread_mutexattr_init;
pthread_mutexattr_setprioceiling;
pthread_mutexattr_setprotocol; pthread_mutexattr_setprotocol;
pthread_mutexattr_setpshared; pthread_mutexattr_setpshared;
pthread_mutexattr_settype; pthread_mutexattr_settype;
@ -94,10 +96,12 @@ libc {
pthread_condattr_getpshared; pthread_condattr_getpshared;
pthread_condattr_setclock; pthread_condattr_setclock;
pthread_condattr_setpshared; pthread_condattr_setpshared;
pthread_mutexattr_getprioceiling;
pthread_mutexattr_getprotocol; pthread_mutexattr_getprotocol;
pthread_mutexattr_getpshared; pthread_mutexattr_getpshared;
pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np; pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np;
pthread_mutexattr_gettype; pthread_mutexattr_gettype;
pthread_mutexattr_setprioceiling;
pthread_mutexattr_setprotocol; pthread_mutexattr_setprotocol;
pthread_mutexattr_setpshared; pthread_mutexattr_setpshared;
pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np; pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np;
@ -196,9 +200,6 @@ libpthread {
pthread_mutex_timedlock; pthread_mutex_transfer_np; pthread_mutex_timedlock; pthread_mutex_transfer_np;
pthread_mutex_trylock; pthread_mutex_unlock; pthread_mutex_trylock; pthread_mutex_unlock;
pthread_mutexattr_getprioceiling;
pthread_mutexattr_setprioceiling;
pthread_once; pthread_once;
pthread_rwlock_destroy; pthread_rwlock_init; pthread_rwlock_rdlock; pthread_rwlock_destroy; pthread_rwlock_init; pthread_rwlock_rdlock;

View file

@ -62,6 +62,13 @@ extern int __pthread_mutexattr_setrobust (pthread_mutexattr_t *__attr,
int __robustness); int __robustness);
libc_hidden_proto (__pthread_mutexattr_setrobust) 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, extern int __pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr,
int *__restrict __protocol); int *__restrict __protocol);
libc_hidden_proto (__pthread_mutexattr_getprotocol) libc_hidden_proto (__pthread_mutexattr_getprotocol)

View file

@ -16,19 +16,25 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <pthread.h> #include <pthreadP.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <pt-internal.h> #include <pt-internal.h>
#include "pt-mutex.h" #include "pt-mutex.h"
#include <hurdlock.h> #include <hurdlock.h>
#include <shlib-compat.h>
int int
pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *ap, int *clp) __pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *ap, int *clp)
{ {
(void) ap; (void) ap;
(void) clp; (void) clp;
return ENOSYS; 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) stub_warning (pthread_mutexattr_getprioceiling)

View file

@ -16,19 +16,25 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <pthread.h> #include <pthreadP.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <pt-internal.h> #include <pt-internal.h>
#include "pt-mutex.h" #include "pt-mutex.h"
#include <hurdlock.h> #include <hurdlock.h>
#include <shlib-compat.h>
int int
pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attrp, int cl) __pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attrp, int cl)
{ {
(void) attrp; (void) attrp;
(void) cl; (void) cl;
return ENOSYS; 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) stub_warning (pthread_mutexattr_setprioceiling)

View file

@ -64,10 +64,12 @@ GLIBC_2.12 pthread_condattr_setpshared F
GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_equal F
GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_getschedparam F
GLIBC_2.12 pthread_mutexattr_destroy 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_getprotocol F
GLIBC_2.12 pthread_mutexattr_getpshared F GLIBC_2.12 pthread_mutexattr_getpshared F
GLIBC_2.12 pthread_mutexattr_gettype F GLIBC_2.12 pthread_mutexattr_gettype F
GLIBC_2.12 pthread_mutexattr_init 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_setprotocol F
GLIBC_2.12 pthread_mutexattr_setpshared F GLIBC_2.12 pthread_mutexattr_setpshared F
GLIBC_2.12 pthread_mutexattr_settype 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_getpshared F
GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setclock F
GLIBC_2.41 pthread_condattr_setpshared 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_getprotocol F
GLIBC_2.41 pthread_mutexattr_getpshared F GLIBC_2.41 pthread_mutexattr_getpshared F
GLIBC_2.41 pthread_mutexattr_getrobust F GLIBC_2.41 pthread_mutexattr_getrobust F
GLIBC_2.41 pthread_mutexattr_getrobust_np F GLIBC_2.41 pthread_mutexattr_getrobust_np F
GLIBC_2.41 pthread_mutexattr_gettype 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_setprotocol F
GLIBC_2.41 pthread_mutexattr_setpshared F GLIBC_2.41 pthread_mutexattr_setpshared F
GLIBC_2.41 pthread_mutexattr_setrobust F GLIBC_2.41 pthread_mutexattr_setrobust F

View file

@ -50,8 +50,6 @@ GLIBC_2.12 pthread_mutex_timedlock F
GLIBC_2.12 pthread_mutex_transfer_np F GLIBC_2.12 pthread_mutex_transfer_np F
GLIBC_2.12 pthread_mutex_trylock F GLIBC_2.12 pthread_mutex_trylock F
GLIBC_2.12 pthread_mutex_unlock 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_once F
GLIBC_2.12 pthread_rwlock_destroy F GLIBC_2.12 pthread_rwlock_destroy F
GLIBC_2.12 pthread_rwlock_init F GLIBC_2.12 pthread_rwlock_init F

View file

@ -1552,12 +1552,14 @@ GLIBC_2.38 pthread_mutex_init F
GLIBC_2.38 pthread_mutex_lock F GLIBC_2.38 pthread_mutex_lock F
GLIBC_2.38 pthread_mutex_unlock F GLIBC_2.38 pthread_mutex_unlock F
GLIBC_2.38 pthread_mutexattr_destroy 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_getprotocol F
GLIBC_2.38 pthread_mutexattr_getpshared F GLIBC_2.38 pthread_mutexattr_getpshared F
GLIBC_2.38 pthread_mutexattr_getrobust F GLIBC_2.38 pthread_mutexattr_getrobust F
GLIBC_2.38 pthread_mutexattr_getrobust_np F GLIBC_2.38 pthread_mutexattr_getrobust_np F
GLIBC_2.38 pthread_mutexattr_gettype F GLIBC_2.38 pthread_mutexattr_gettype F
GLIBC_2.38 pthread_mutexattr_init 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_setprotocol F
GLIBC_2.38 pthread_mutexattr_setpshared F GLIBC_2.38 pthread_mutexattr_setpshared F
GLIBC_2.38 pthread_mutexattr_setrobust 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_getpshared F
GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setclock F
GLIBC_2.41 pthread_condattr_setpshared 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_getprotocol F
GLIBC_2.41 pthread_mutexattr_getpshared F GLIBC_2.41 pthread_mutexattr_getpshared F
GLIBC_2.41 pthread_mutexattr_getrobust F GLIBC_2.41 pthread_mutexattr_getrobust F
GLIBC_2.41 pthread_mutexattr_getrobust_np F GLIBC_2.41 pthread_mutexattr_getrobust_np F
GLIBC_2.41 pthread_mutexattr_gettype 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_setprotocol F
GLIBC_2.41 pthread_mutexattr_setpshared F GLIBC_2.41 pthread_mutexattr_setpshared F
GLIBC_2.41 pthread_mutexattr_setrobust F GLIBC_2.41 pthread_mutexattr_setrobust F

View file

@ -73,8 +73,6 @@ GLIBC_2.38 pthread_mutex_timedlock F
GLIBC_2.38 pthread_mutex_transfer_np F GLIBC_2.38 pthread_mutex_transfer_np F
GLIBC_2.38 pthread_mutex_trylock F GLIBC_2.38 pthread_mutex_trylock F
GLIBC_2.38 pthread_mutex_unlock 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_once F
GLIBC_2.38 pthread_rwlock_clockrdlock F GLIBC_2.38 pthread_rwlock_clockrdlock F
GLIBC_2.38 pthread_rwlock_clockwrlock F GLIBC_2.38 pthread_rwlock_clockwrlock F