htl: move pthread_mutex_getprioceiling, pthread_mutex_setprioceiling into libc

Message-ID: <20250103103750.870897-4-gfleury@disroot.org>
This commit is contained in:
gfleury 2025-01-03 12:37:47 +02:00 committed by Samuel Thibault
parent 2ebc2d8e24
commit be9f0e7681
9 changed files with 37 additions and 12 deletions

View file

@ -56,8 +56,6 @@ libpthread-routines := \
pt-cancel \ pt-cancel \
pt-mutex-destroy \ pt-mutex-destroy \
pt-mutex-transfer-np \ pt-mutex-transfer-np \
pt-mutex-getprioceiling \
pt-mutex-setprioceiling \
pt-mutex-consistent \ pt-mutex-consistent \
pt-rwlock-attr \ pt-rwlock-attr \
pt-rwlockattr-init \ pt-rwlockattr-init \
@ -184,8 +182,10 @@ routines := \
pt-condattr-setpshared \ pt-condattr-setpshared \
pt-getschedparam \ pt-getschedparam \
pt-mutex-checklocked \ pt-mutex-checklocked \
pt-mutex-getprioceiling \
pt-mutex-init \ pt-mutex-init \
pt-mutex-lock \ pt-mutex-lock \
pt-mutex-setprioceiling \
pt-mutex-timedlock \ pt-mutex-timedlock \
pt-mutex-trylock \ pt-mutex-trylock \
pt-mutex-unlock \ pt-mutex-unlock \

View file

@ -38,8 +38,10 @@ libc {
pthread_condattr_getpshared; pthread_condattr_getpshared;
pthread_condattr_setclock; pthread_condattr_setclock;
pthread_condattr_setpshared; pthread_condattr_setpshared;
pthread_mutex_getprioceiling;
pthread_mutex_init; pthread_mutex_init;
pthread_mutex_lock; pthread_mutex_lock;
pthread_mutex_setprioceiling;
pthread_mutex_timedlock; pthread_mutex_timedlock;
pthread_mutex_trylock; pthread_mutex_trylock;
pthread_mutex_unlock; pthread_mutex_unlock;
@ -117,6 +119,8 @@ libc {
} }
GLIBC_2.42 { GLIBC_2.42 {
pthread_mutex_getprioceiling;
pthread_mutex_setprioceiling;
pthread_mutex_trylock; pthread_mutex_trylock;
} }
@ -210,8 +214,7 @@ libpthread {
pthread_kill; pthread_kill;
__pthread_kill; __pthread_kill;
pthread_mutex_destroy; pthread_mutex_getprioceiling; pthread_mutex_destroy;
pthread_mutex_setprioceiling;
pthread_mutex_transfer_np; pthread_mutex_transfer_np;
pthread_once; pthread_once;

View file

@ -39,6 +39,12 @@ libc_hidden_proto (__pthread_mutex_clocklock)
extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex); extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex);
extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
libc_hidden_proto (__pthread_mutex_lock) 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); extern int __pthread_mutex_trylock (pthread_mutex_t *_mutex);
libc_hidden_proto (__pthread_mutex_trylock) libc_hidden_proto (__pthread_mutex_trylock)
extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex, extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex,

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_mutex_getprioceiling (const pthread_mutex_t *mtxp, int *clp) __pthread_mutex_getprioceiling (const pthread_mutex_t *mtxp, int *clp)
{ {
(void) mtxp; (void) mtxp;
(void) clp; (void) clp;
return ENOSYS; 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) stub_warning (pthread_mutex_getprioceiling)

View file

@ -16,20 +16,26 @@
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_mutex_setprioceiling (pthread_mutex_t *mtxp, int cl, int *prp) __pthread_mutex_setprioceiling (pthread_mutex_t *mtxp, int cl, int *prp)
{ {
(void) mtxp; (void) mtxp;
(void) cl; (void) cl;
(void) prp; (void) prp;
return ENOSYS; 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) stub_warning (pthread_mutex_setprioceiling)

View file

@ -63,8 +63,10 @@ GLIBC_2.12 pthread_condattr_setclock F
GLIBC_2.12 pthread_condattr_setpshared F 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_mutex_getprioceiling F
GLIBC_2.12 pthread_mutex_init F GLIBC_2.12 pthread_mutex_init F
GLIBC_2.12 pthread_mutex_lock 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_timedlock 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
@ -2554,6 +2556,8 @@ GLIBC_2.41 pthread_mutexattr_setrobust F
GLIBC_2.41 pthread_mutexattr_setrobust_np F GLIBC_2.41 pthread_mutexattr_setrobust_np F
GLIBC_2.41 pthread_mutexattr_settype F GLIBC_2.41 pthread_mutexattr_settype F
GLIBC_2.41 pthread_sigmask 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.42 pthread_mutex_trylock F
GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 __readlinkat_chk F
GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_append F

View file

@ -42,8 +42,6 @@ GLIBC_2.12 pthread_key_create F
GLIBC_2.12 pthread_key_delete F GLIBC_2.12 pthread_key_delete F
GLIBC_2.12 pthread_kill F GLIBC_2.12 pthread_kill F
GLIBC_2.12 pthread_mutex_destroy 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_mutex_transfer_np 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

View file

@ -1549,8 +1549,10 @@ GLIBC_2.38 pthread_exit F
GLIBC_2.38 pthread_getschedparam F GLIBC_2.38 pthread_getschedparam F
GLIBC_2.38 pthread_mutex_clocklock F GLIBC_2.38 pthread_mutex_clocklock F
GLIBC_2.38 pthread_mutex_destroy 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_init F
GLIBC_2.38 pthread_mutex_lock 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_timedlock 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
@ -2240,6 +2242,8 @@ GLIBC_2.41 pthread_mutexattr_setrobust F
GLIBC_2.41 pthread_mutexattr_setrobust_np F GLIBC_2.41 pthread_mutexattr_setrobust_np F
GLIBC_2.41 pthread_mutexattr_settype F GLIBC_2.41 pthread_mutexattr_settype F
GLIBC_2.41 pthread_sigmask 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.42 pthread_mutex_trylock F
HURD_CTHREADS_0.3 __cthread_getspecific F HURD_CTHREADS_0.3 __cthread_getspecific F
HURD_CTHREADS_0.3 __cthread_keycreate F HURD_CTHREADS_0.3 __cthread_keycreate F

View file

@ -64,8 +64,6 @@ GLIBC_2.38 pthread_kill F
GLIBC_2.38 pthread_mutex_consistent F GLIBC_2.38 pthread_mutex_consistent F
GLIBC_2.38 pthread_mutex_consistent_np F GLIBC_2.38 pthread_mutex_consistent_np F
GLIBC_2.38 pthread_mutex_destroy 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_mutex_transfer_np 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