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

htl: move pthread_exit into libc. 

Message-ID: <20250815181500.107433-17-gfleury@disroot.org>
This commit is contained in:
gfleury 2025-08-15 20:14:57 +02:00 committed by Samuel Thibault
parent a901f2599e
commit 36982b0fdb
12 changed files with 15 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htl/Makefile
View File

@ -26,7 +26,6 @@ LCLHDRS :=
libpthread-routines := \
pt-create \
pt-exit \
pt-initialize \
pt-join \
pt-spin-inlines \
@ -141,6 +140,7 @@ routines := \
pt-destroy-specific \
pt-detach \
pt-docancel \
pt-exit \
pt-getattr \
pt-getconcurrency \
pt-getcpuclockid \

4
htl/Versions
View File

@ -58,6 +58,7 @@ libc {
pthread_key_create;
pthread_key_delete;
pthread_kill;
pthread_exit;
pthread_mutex_destroy;
pthread_mutex_getprioceiling;
pthread_mutex_init;
@ -245,6 +246,7 @@ libc {
__pthread_condattr_init;
__pthread_default_condattr;
__pthread_destroy_specific;
__pthread_exit;
__pthread_getspecific;
__pthread_key_delete;
__pthread_max_threads;
@ -297,7 +299,7 @@ libpthread {
pthread_atfork;
pthread_create; pthread_exit;
pthread_create;
pthread_join;

30
htl/forward.c
View File

@ -27,33 +27,3 @@
/* Pointers to the libc functions. */
struct pthread_functions __libc_pthread_functions attribute_hidden;
int __libc_pthread_functions_init attribute_hidden;
#define FORWARD2(name, rettype, decl, params, defaction) \
rettype \
name decl \
{ \
if (!__libc_pthread_functions_init) \
defaction; \
\
return PTHFCT_CALL (ptr_##name, params); \
}
/* Same as FORWARD2, only without return. */
#define FORWARD_NORETURN(name, rettype, decl, params, defaction) \
rettype \
name decl \
{ \
if (!__libc_pthread_functions_init) \
defaction; \
\
PTHFCT_CALL (ptr_##name, params); \
}
#define FORWARD(name, decl, params, defretval) \
FORWARD2 (name, int, decl, params, return defretval)
/* Use an alias to avoid warning, as pthread_exit is declared noreturn. */
FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
exit (EXIT_SUCCESS))
strong_alias (__pthread_exit, pthread_exit);

9
htl/pt-exit.c
View File

@ -25,7 +25,7 @@
#include <pthreadP.h>
#include <atomic.h>
#include <shlib-compat.h>
/* Terminate the current thread and make STATUS available to any
thread that might join it. */
@ -112,4 +112,9 @@ __pthread_exit (void *status)
abort ();
}
weak_alias (__pthread_exit, pthread_exit);
libc_hidden_def (__pthread_exit)
versioned_symbol (libc, __pthread_exit, pthread_exit, GLIBC_2_21);
#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21)
compat_symbol (libpthread, __pthread_exit, pthread_exit, GLIBC_2_12);
#endif

1
htl/pt-initialize.c
View File

@ -27,7 +27,6 @@
#if IS_IN (libpthread)
static const struct pthread_functions pthread_functions = {
.ptr___pthread_exit = __pthread_exit,
.ptr__IO_flockfile = _cthreads_flockfile,
.ptr__IO_funlockfile = _cthreads_funlockfile,
.ptr__IO_ftrylockfile = _cthreads_ftrylockfile,

2
htl/pt-setcancelstate.c
View File

@ -45,7 +45,7 @@ __pthread_setcancelstate (int state, int *oldstate)
p->cancel_pending = 2;
__pthread_mutex_unlock (&p->cancel_lock);
if (cancelled && __pthread_exit)
if (cancelled)
__pthread_exit (PTHREAD_CANCELED);
return 0;

2
htl/pt-setcanceltype.c
View File

@ -42,7 +42,7 @@ __pthread_setcanceltype (int type, int *oldtype)
cancelled = (p->cancel_state == PTHREAD_CANCEL_ENABLE) && p->cancel_pending && (p->cancel_type == PTHREAD_CANCEL_ASYNCHRONOUS);
__pthread_mutex_unlock (&p->cancel_lock);
if (cancelled && __pthread_exit)
if (cancelled)
__pthread_exit (PTHREAD_CANCELED);
return 0;

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

@ -21,8 +21,6 @@
#include <pthread.h>
void __pthread_exit (void *) __attribute__ ((__noreturn__));
void _cthreads_flockfile (FILE *);
void _cthreads_funlockfile (FILE *);
int _cthreads_ftrylockfile (FILE *);
@ -32,7 +30,6 @@ int _cthreads_ftrylockfile (FILE *);
so if possible avoid breaking it and append new hooks to the end. */
struct pthread_functions
{
void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__));
void (*ptr__IO_flockfile) (FILE *);
void (*ptr__IO_funlockfile) (FILE *);
int (*ptr__IO_ftrylockfile) (FILE *);

9
sysdeps/htl/pthreadP.h
View File

@ -182,6 +182,7 @@ void __cthread_detach (__cthread_t);
int __pthread_detach (pthread_t __threadp);
libc_hidden_proto (__pthread_detach)
void __pthread_exit (void *value) __attribute__ ((__noreturn__));
libc_hidden_proto (__pthread_exit)
int __pthread_join (pthread_t, void **);
int __cthread_keycreate (__cthread_key_t *);
int __cthread_getspecific (__cthread_key_t, void **);
@ -233,14 +234,6 @@ libc_hidden_proto (__pthread_get_cleanup_stack)
hidden_proto (__pthread_create)
#endif
#if !defined(__NO_WEAK_PTHREAD_ALIASES) && !IS_IN (libpthread)
# ifdef weak_extern
weak_extern (__pthread_exit)
# else
# pragma weak __pthread_exit
# endif
#endif
#define ASSERT_TYPE_SIZE(type, size) \
_Static_assert (sizeof (type) == size, \
"sizeof (" #type ") != " #size)

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

@ -75,6 +75,7 @@ GLIBC_2.12 pthread_condattr_setclock F
GLIBC_2.12 pthread_condattr_setpshared F
GLIBC_2.12 pthread_detach F
GLIBC_2.12 pthread_equal F
GLIBC_2.12 pthread_exit F
GLIBC_2.12 pthread_getattr_np F
GLIBC_2.12 pthread_getconcurrency F
GLIBC_2.12 pthread_getcpuclockid F

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

@ -19,7 +19,6 @@ GLIBC_2.12 ftrylockfile F
GLIBC_2.12 funlockfile F
GLIBC_2.12 pthread_atfork F
GLIBC_2.12 pthread_create F
GLIBC_2.12 pthread_exit F
GLIBC_2.12 pthread_join F
GLIBC_2.12 pthread_spin_destroy F
GLIBC_2.12 pthread_spin_init F

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

@ -37,7 +37,6 @@ GLIBC_2.38 mtx_trylock F
GLIBC_2.38 mtx_unlock F
GLIBC_2.38 pthread_clockjoin_np F
GLIBC_2.38 pthread_create F
GLIBC_2.38 pthread_exit F
GLIBC_2.38 pthread_hurd_cond_timedwait_np F
GLIBC_2.38 pthread_hurd_cond_wait_np F
GLIBC_2.38 pthread_join F