mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-23 13:09:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

htl: move pthread_cond_broadcast into libc.

Browse Source 
Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20241219203727.669825-5-gfleury@disroot.org>
This commit is contained in:
gfleury 2024-12-19 22:37:23 +02:00 committed by Samuel Thibault
parent 917a131ab9
commit 3089d23517
11 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htl/Makefile
View File

@ -91,7 +91,6 @@ libpthread-routines := \
pt-rwlock-timedrdlock \
pt-rwlock-timedwrlock \
pt-rwlock-unlock \
pt-cond-brdcast \
pt-cond-signal \
pt-cond-wait \
pt-cond-timedwait \
@ -194,6 +193,7 @@ routines := \
pt-attr-setstackaddr \
pt-attr-setstacksize \
pt-cond \
pt-cond-brdcast \
pt-cond-destroy \
pt-cond-init \
pt-condattr-destroy \

3
htl/Versions
View File

@ -26,6 +26,7 @@ libc {
pthread_attr_setscope;
pthread_attr_setschedparam;
pthread_attr_init;
pthread_cond_broadcast;
pthread_cond_destroy;
pthread_cond_init;
pthread_condattr_getclock;
@ -96,6 +97,7 @@ libc {
__pthread_attr_setstacksize;
__pthread_attr_setstackaddr;
__pthread_attr_setstack;
__pthread_cond_broadcast;
__pthread_cond_destroy;
__pthread_cond_init;
__pthread_condattr_init;
@ -138,7 +140,6 @@ libpthread {
pthread_cancel;
pthread_cond_broadcast;
pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait;
pthread_create; pthread_detach; pthread_exit;

1
htl/forward.c
View File

@ -53,7 +53,6 @@ name decl \
#define FORWARD(name, decl, params, defretval) \
FORWARD2 (name, int, decl, params, return defretval)
FORWARD (pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0)
FORWARD (pthread_cond_signal, (pthread_cond_t *cond), (cond), 0)
FORWARD (pthread_cond_wait, (pthread_cond_t *cond, pthread_mutex_t *mutex),
(cond, mutex), 0)

1
htl/pt-initialize.c
View File

@ -27,7 +27,6 @@
#if IS_IN (libpthread)
static const struct pthread_functions pthread_functions = {
.ptr_pthread_cond_broadcast = __pthread_cond_broadcast,
.ptr_pthread_cond_signal = __pthread_cond_signal,
.ptr_pthread_cond_wait = __pthread_cond_wait,
.ptr_pthread_cond_timedwait = __pthread_cond_timedwait,

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

@ -17,7 +17,7 @@
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h>
/* Unblock all threads that are blocked on condition variable COND. */
@ -40,5 +40,9 @@ __pthread_cond_broadcast (pthread_cond_t *cond)
return 0;
}
libc_hidden_def (__pthread_cond_broadcast)
versioned_symbol (libc, __pthread_cond_broadcast, pthread_cond_broadcast, GLIBC_2_21);
weak_alias (__pthread_cond_broadcast, pthread_cond_broadcast);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_cond_broadcast, pthread_cond_broadcast, GLIBC_2_12);
#endif

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

@ -21,7 +21,6 @@
#include <pthread.h>
int __pthread_cond_broadcast (pthread_cond_t *);
int __pthread_cond_signal (pthread_cond_t *);
int __pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *);
int __pthread_cond_timedwait (pthread_cond_t *, pthread_mutex_t *,
@ -53,7 +52,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_broadcast) (pthread_cond_t *);
int (*ptr_pthread_cond_signal) (pthread_cond_t *);
int (*ptr_pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *);
int (*ptr_pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *,

1
sysdeps/htl/pthreadP.h
View File

@ -46,6 +46,7 @@ extern int __pthread_cond_init (pthread_cond_t *cond,
libc_hidden_proto (__pthread_cond_init)
extern int __pthread_cond_signal (pthread_cond_t *cond);
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);
extern int __pthread_cond_timedwait (pthread_cond_t *cond,
pthread_mutex_t *mutex,

6
sysdeps/htl/timer_routines.c
View File

@ -280,7 +280,7 @@ thread_cleanup (void *val)
pthread_mutex_unlock (&__timer_mutex);
/* Unblock potentially blocked timer_delete(). */
pthread_cond_broadcast (&thread->cond);
__pthread_cond_broadcast (&thread->cond);
}
}
@ -338,7 +338,7 @@ thread_expire_timer (struct thread_node *self, struct timer_node *timer)
self->current_timer = 0;
pthread_cond_broadcast (&self->cond);
__pthread_cond_broadcast (&self->cond);
}
@ -486,7 +486,7 @@ __timer_thread_start (struct thread_node *thread)
void
__timer_thread_wakeup (struct thread_node *thread)
{
pthread_cond_broadcast (&thread->cond);
__pthread_cond_broadcast (&thread->cond);
}

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

@ -49,6 +49,7 @@ GLIBC_2.12 pthread_attr_setscope F
GLIBC_2.12 pthread_attr_setstack F
GLIBC_2.12 pthread_attr_setstackaddr F
GLIBC_2.12 pthread_attr_setstacksize F
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_condattr_destroy F

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

@ -30,7 +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_broadcast F
GLIBC_2.12 pthread_cond_signal F
GLIBC_2.12 pthread_cond_timedwait F
GLIBC_2.12 pthread_cond_wait F

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

@ -48,7 +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_broadcast F
GLIBC_2.38 pthread_cond_clockwait F
GLIBC_2.38 pthread_cond_signal F
GLIBC_2.38 pthread_cond_timedwait F