mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-06 14:10:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

htl: move pthread_cond_init into libc.

Browse Source 
Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20241219203727.669825-2-gfleury@disroot.org>
This commit is contained in:
gfleury 2024-12-19 22:37:20 +02:00 committed by Samuel Thibault
parent fd30525ead
commit 8735ea79ab
11 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htl/Makefile
View File

@ -92,7 +92,6 @@ libpthread-routines := \
pt-rwlock-timedwrlock \
pt-rwlock-unlock \
pt-cond-destroy \
pt-cond-init \
pt-cond-brdcast \
pt-cond-signal \
pt-cond-wait \
@ -197,6 +196,7 @@ routines := \
pt-attr-setstackaddr \
pt-attr-setstacksize \
pt-cond \
pt-cond-init \
pt-condattr-destroy \
pt-condattr-getclock \
pt-condattr-getpshared \

4
htl/Versions
View File

@ -26,6 +26,7 @@ libc {
pthread_attr_setscope;
pthread_attr_setschedparam;
pthread_attr_init;
pthread_cond_init;
pthread_condattr_getclock;
pthread_condattr_init;
pthread_condattr_destroy;
@ -94,6 +95,7 @@ libc {
__pthread_attr_setstacksize;
__pthread_attr_setstackaddr;
__pthread_attr_setstack;
__pthread_cond_init;
__pthread_condattr_init;
__pthread_default_condattr;
__pthread_sigstate;
@ -133,7 +135,7 @@ libpthread {
pthread_cancel;
pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init;
pthread_cond_broadcast; pthread_cond_destroy;
pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait;
pthread_create; pthread_detach; pthread_exit;

3
htl/forward.c
View File

@ -55,9 +55,6 @@ name decl \
FORWARD (pthread_cond_broadcast, (pthread_cond_t *cond), (cond), 0)
FORWARD (pthread_cond_destroy, (pthread_cond_t *cond), (cond), 0)
FORWARD (pthread_cond_init,
(pthread_cond_t *cond, const pthread_condattr_t *cond_attr),
(cond, cond_attr), 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

@ -29,7 +29,6 @@
static const struct pthread_functions pthread_functions = {
.ptr_pthread_cond_broadcast = __pthread_cond_broadcast,
.ptr_pthread_cond_destroy = __pthread_cond_destroy,
.ptr_pthread_cond_init = __pthread_cond_init,
.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-init.c
View File

@ -19,7 +19,7 @@
#include <pthread.h>
#include <assert.h>
#include <string.h>
#include <shlib-compat.h>
#include <pt-internal.h>
int
@ -43,5 +43,9 @@ __pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t * attr)
*cond->__attr = *attr;
return 0;
}
libc_hidden_def (__pthread_cond_init)
versioned_symbol (libc, __pthread_cond_init, pthread_cond_init, GLIBC_2_21);
weak_alias (__pthread_cond_init, pthread_cond_init);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libc, __pthread_cond_init, pthread_cond_init, GLIBC_2_12);
#endif

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

@ -23,8 +23,6 @@
int __pthread_cond_broadcast (pthread_cond_t *);
int __pthread_cond_destroy (pthread_cond_t *);
int __pthread_cond_init (pthread_cond_t *,
const pthread_condattr_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 *,
@ -58,8 +56,6 @@ struct pthread_functions
{
int (*ptr_pthread_cond_broadcast) (pthread_cond_t *);
int (*ptr_pthread_cond_destroy) (pthread_cond_t *);
int (*ptr_pthread_cond_init) (pthread_cond_t *,
const pthread_condattr_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

@ -43,6 +43,7 @@ extern int __pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind);
extern int __pthread_cond_init (pthread_cond_t *cond,
const pthread_condattr_t *cond_attr);
libc_hidden_proto (__pthread_cond_init)
extern int __pthread_cond_signal (pthread_cond_t *cond);
extern int __pthread_cond_broadcast (pthread_cond_t *cond);
extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex);

2
sysdeps/htl/timer_routines.c
View File

@ -151,7 +151,7 @@ thread_init (struct thread_node *thread, const pthread_attr_t *attr, clockid_t c
thread->exists = 0;
INIT_LIST_HEAD (&thread->timer_queue);
pthread_cond_init (&thread->cond, 0);
__pthread_cond_init (&thread->cond, 0);
thread->current_timer = 0;
thread->captured = pthread_self ();
thread->clock_id = clock_id;

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_init F
GLIBC_2.12 pthread_condattr_destroy F
GLIBC_2.12 pthread_condattr_getclock F
GLIBC_2.12 pthread_condattr_getpshared F

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

@ -32,7 +32,6 @@ 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_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

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

@ -51,7 +51,6 @@ 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_destroy F
GLIBC_2.38 pthread_cond_init F
GLIBC_2.38 pthread_cond_signal F
GLIBC_2.38 pthread_cond_timedwait F
GLIBC_2.38 pthread_cond_wait F