qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

htl: move pthread_cond_timedwait, pthread_cond_clockwait, pthread_cond_wait into libc. 

Message-ID: <20241219203727.669825-9-gfleury@disroot.org>
This commit is contained in:
gfleury 2024-12-19 22:37:27 +02:00 committed by Samuel Thibault
parent ba8522542f
commit f646be6ff6
13 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htl/Makefile
View File

@ -90,8 +90,6 @@ libpthread-routines := \
pt-rwlock-timedrdlock \
pt-rwlock-timedwrlock \
pt-rwlock-unlock \
pt-cond-wait \
pt-cond-timedwait \
pt-hurd-cond-wait \
pt-hurd-cond-timedwait \
pt-stack-alloc \
@ -193,6 +191,8 @@ routines := \
pt-cond-destroy \
pt-cond-init \
pt-cond-signal \
pt-cond-timedwait \
pt-cond-wait \
pt-condattr-destroy \
pt-condattr-getclock \
pt-condattr-getpshared \

11
htl/Versions
View File

@ -30,6 +30,8 @@ libc {
pthread_cond_destroy;
pthread_cond_init;
pthread_cond_signal;
pthread_cond_timedwait;
pthread_cond_wait;
pthread_condattr_getclock;
pthread_condattr_init;
pthread_condattr_destroy;
@ -64,6 +66,8 @@ libc {
# C11 thread symbols.
GLIBC_2.32 {
thrd_current; thrd_equal; thrd_sleep; thrd_yield;
pthread_cond_clockwait;
}
GLIBC_2.41 {
@ -103,7 +107,10 @@ libc {
__pthread_cond_broadcast;
__pthread_cond_destroy;
__pthread_cond_init;
__pthread_cond_clockwait;
__pthread_cond_signal;
__pthread_cond_timedwait;
__pthread_cond_wait;
__pthread_condattr_init;
__pthread_default_condattr;
__pthread_mutex_checklocked;
@ -147,8 +154,6 @@ libpthread {
pthread_cancel;
pthread_cond_timedwait; pthread_cond_wait;
pthread_create; pthread_detach; pthread_exit;
pthread_getattr_np;
@ -214,8 +219,6 @@ libpthread {
cnd_broadcast; cnd_destroy; cnd_init; cnd_signal; cnd_timedwait; cnd_wait;
tss_create; tss_delete; tss_get; tss_set;
pthread_cond_clockwait;
pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np;
pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np;

6
htl/forward.c
View File

@ -53,12 +53,6 @@ name decl \
#define FORWARD(name, decl, params, defretval) \
FORWARD2 (name, int, decl, params, return defretval)
FORWARD (pthread_cond_wait, (pthread_cond_t *cond, pthread_mutex_t *mutex),
(cond, mutex), 0)
FORWARD (pthread_cond_timedwait,
(pthread_cond_t *cond, pthread_mutex_t *mutex,
const struct timespec *abstime), (cond, mutex, abstime), 0)
/* Use an alias to avoid warning, as pthread_exit is declared noreturn. */
FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
exit (EXIT_SUCCESS))

2
htl/pt-initialize.c
View File

@ -27,8 +27,6 @@
#if IS_IN (libpthread)
static const struct pthread_functions pthread_functions = {
.ptr_pthread_cond_wait = __pthread_cond_wait,
.ptr_pthread_cond_timedwait = __pthread_cond_timedwait,
.ptr___pthread_exit = __pthread_exit,
.ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
.ptr_pthread_mutex_init = __pthread_mutex_init,

10
sysdeps/htl/pt-cond-timedwait.c
View File

@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
#include <pthreadP.h>
#include <time.h>
@ -34,8 +34,12 @@ __pthread_cond_timedwait (pthread_cond_t *cond,
{
return __pthread_cond_timedwait_internal (cond, mutex, -1, abstime);
}
libc_hidden_def (__pthread_cond_timedwait)
versioned_symbol (libc, __pthread_cond_timedwait, pthread_cond_timedwait, GLIBC_2_21);
weak_alias (__pthread_cond_timedwait, pthread_cond_timedwait);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_cond_timedwait, pthread_cond_timedwait, GLIBC_2_12);
#endif
int
__pthread_cond_clockwait (pthread_cond_t *cond,
@ -45,8 +49,8 @@ __pthread_cond_clockwait (pthread_cond_t *cond,
{
return __pthread_cond_timedwait_internal (cond, mutex, clockid, abstime);
}
weak_alias (__pthread_cond_clockwait, pthread_cond_clockwait);
libc_hidden_def (__pthread_cond_clockwait)
struct cancel_ctx
{

8
sysdeps/htl/pt-cond-wait.c
View File

@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
/* Implemented in pt-cond-timedwait.c. */
@ -35,5 +35,9 @@ __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex)
{
return __pthread_cond_timedwait_internal (cond, mutex, -1, 0);
}
libc_hidden_def (__pthread_cond_wait)
versioned_symbol (libc, __pthread_cond_wait, pthread_cond_wait, GLIBC_2_21);
weak_alias (__pthread_cond_wait, pthread_cond_wait);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_cond_wait, pthread_cond_wait, GLIBC_2_12);
#endif

6
sysdeps/htl/pthread-functions.h
View File

@ -21,9 +21,6 @@
#include <pthread.h>
int __pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *);
int __pthread_cond_timedwait (pthread_cond_t *, pthread_mutex_t *,
const struct timespec *);
void __pthread_exit (void *) __attribute__ ((__noreturn__));
int _pthread_mutex_destroy (pthread_mutex_t *);
int _pthread_mutex_init (pthread_mutex_t *,
@ -51,9 +48,6 @@ int _cthreads_ftrylockfile (FILE *);
so if possible avoid breaking it and append new hooks to the end. */
struct pthread_functions
{
int (*ptr_pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *);
int (*ptr_pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,
const struct timespec *);
void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
int (*ptr_pthread_mutex_destroy) (pthread_mutex_t *);
int (*ptr_pthread_mutex_init) (pthread_mutex_t *,

3
sysdeps/htl/pthreadP.h
View File

@ -49,14 +49,17 @@ libc_hidden_proto (__pthread_cond_signal);
extern int __pthread_cond_broadcast (pthread_cond_t *cond);
libc_hidden_proto (__pthread_cond_broadcast);
extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex);
libc_hidden_proto (__pthread_cond_wait);
extern int __pthread_cond_timedwait (pthread_cond_t *cond,
pthread_mutex_t *mutex,
const struct timespec *abstime);
libc_hidden_proto (__pthread_cond_timedwait);
extern int __pthread_cond_clockwait (pthread_cond_t *cond,
pthread_mutex_t *mutex,
clockid_t clockid,
const struct timespec *abstime)
__nonnull ((1, 2, 4));
libc_hidden_proto (__pthread_cond_clockwait);
extern int __pthread_cond_destroy (pthread_cond_t *cond);
libc_hidden_proto (__pthread_cond_destroy);
extern int __pthread_sigmask (int, const sigset_t *, sigset_t *);

4
sysdeps/htl/timer_routines.c
View File

@ -418,10 +418,10 @@ thread_func (void *arg)
head of the queue must wake up the thread by broadcasting
this condition variable. */
if (timer != NULL)
pthread_cond_timedwait (&self->cond, &__timer_mutex,
__pthread_cond_timedwait (&self->cond, &__timer_mutex,
&timer->expirytime);
else
pthread_cond_wait (&self->cond, &__timer_mutex);
__pthread_cond_wait (&self->cond, &__timer_mutex);
}
/* This macro will never be executed since the while loop loops
forever - but we have to add it for proper nesting. */

3
sysdeps/mach/hurd/i386/libc.abilist
View File

@ -53,6 +53,8 @@ GLIBC_2.12 pthread_cond_broadcast F
GLIBC_2.12 pthread_cond_destroy F
GLIBC_2.12 pthread_cond_init F
GLIBC_2.12 pthread_cond_signal F
GLIBC_2.12 pthread_cond_timedwait F
GLIBC_2.12 pthread_cond_wait F
GLIBC_2.12 pthread_condattr_destroy F
GLIBC_2.12 pthread_condattr_getclock F
GLIBC_2.12 pthread_condattr_getpshared F
@ -2250,6 +2252,7 @@ GLIBC_2.30 twalk_r F
GLIBC_2.32 __libc_single_threaded D 0x1
GLIBC_2.32 mach_print F
GLIBC_2.32 mremap F
GLIBC_2.32 pthread_cond_clockwait F
GLIBC_2.32 sigabbrev_np F
GLIBC_2.32 sigdescr_np F
GLIBC_2.32 strerrordesc_np F

3
sysdeps/mach/hurd/i386/libpthread.abilist
View File

@ -30,8 +30,6 @@ GLIBC_2.12 pthread_barrierattr_getpshared F
GLIBC_2.12 pthread_barrierattr_init F
GLIBC_2.12 pthread_barrierattr_setpshared F
GLIBC_2.12 pthread_cancel F
GLIBC_2.12 pthread_cond_timedwait F
GLIBC_2.12 pthread_cond_wait F
GLIBC_2.12 pthread_create F
GLIBC_2.12 pthread_detach F
GLIBC_2.12 pthread_exit F
@ -119,7 +117,6 @@ GLIBC_2.32 mtx_timedlock F
GLIBC_2.32 mtx_trylock F
GLIBC_2.32 mtx_unlock F
GLIBC_2.32 pthread_clockjoin_np F
GLIBC_2.32 pthread_cond_clockwait F
GLIBC_2.32 pthread_mutex_clocklock F
GLIBC_2.32 pthread_mutex_consistent F
GLIBC_2.32 pthread_mutex_consistent_np F

1
sysdeps/mach/hurd/x86_64/libc.abilist
View File

@ -1532,6 +1532,7 @@ GLIBC_2.38 pthread_attr_setstack F
GLIBC_2.38 pthread_attr_setstackaddr F
GLIBC_2.38 pthread_attr_setstacksize F
GLIBC_2.38 pthread_cond_broadcast F
GLIBC_2.38 pthread_cond_clockwait F
GLIBC_2.38 pthread_cond_destroy F
GLIBC_2.38 pthread_cond_init F
GLIBC_2.38 pthread_cond_signal F

3
sysdeps/mach/hurd/x86_64/libpthread.abilist
View File

@ -48,9 +48,6 @@ GLIBC_2.38 pthread_barrierattr_init F
GLIBC_2.38 pthread_barrierattr_setpshared F
GLIBC_2.38 pthread_cancel F
GLIBC_2.38 pthread_clockjoin_np F
GLIBC_2.38 pthread_cond_clockwait F
GLIBC_2.38 pthread_cond_timedwait F
GLIBC_2.38 pthread_cond_wait F
GLIBC_2.38 pthread_create F
GLIBC_2.38 pthread_detach F
GLIBC_2.38 pthread_exit F