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

nptl: Move pthread_exit into libc

Browse Source 
The pthread_exit symbol was moved using
scripts/move-symbol-to-libc.py.  No new symbol version is needed
because there was a forwarder.

The new tests nptl/tst-pthread_exit-nothreads and
nptl/tst-pthread_exit-nothreads-static exercise the scenario
that pthread_exit is called without libpthread having been linked in.
This is not possible for the generic code, so these tests do not
live in sysdeps/pthread for now.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2021-04-21 19:49:50 +02:00
parent 2cfef0b042
commit c62cef023c
39 changed files with 66 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nptl/Makefile
View File

@ -74,6 +74,7 @@ routines = \
pthread_condattr_destroy \
pthread_condattr_init \
pthread_equal \
pthread_exit \
pthread_getaffinity \
pthread_getattr_np \
pthread_getschedparam \
@ -134,7 +135,6 @@ libpthread-routines = \
pthread_condattr_setpshared \
pthread_create \
pthread_detach \
pthread_exit \
pthread_getattr_default_np \
pthread_getconcurrency \
pthread_getcpuclockid \
@ -313,7 +313,13 @@ tests = tst-attr2 tst-attr3 tst-default-attr \
tst-pthread-defaultattr-free \
tst-pthread-attr-sigmask \
tst-pthread-timedlock-lockloop \
tst-pthread-gdb-attach tst-pthread-gdb-attach-static
tst-pthread-gdb-attach tst-pthread-gdb-attach-static \
tst-pthread_exit-nothreads \
tst-pthread_exit-nothreads-static \
tests-nolibpthread = \
tst-pthread_exit-nothreads \
tst-pthread_exit-nothreads-static \
tests-container = tst-pthread-getattr
@ -452,7 +458,8 @@ tests-static += tst-stackguard1-static \
tst-cancel24-static \
tst-mutex8-static tst-mutexpi8-static tst-sem11-static \
tst-sem12-static tst-cond11-static \
tst-pthread-gdb-attach-static
tst-pthread-gdb-attach-static \
tst-pthread_exit-nothreads-static
tests += tst-cancel24-static

2
nptl/Versions
View File

@ -118,6 +118,7 @@ libc {
__pthread_cleanup_upto;
__pthread_cond_destroy; # Used by the C11 threads.
__pthread_cond_init; # Used by the C11 threads.
__pthread_exit;
__pthread_force_elision;
__pthread_getattr_default_np;
__pthread_keys;
@ -157,7 +158,6 @@ libpthread {
pthread_cond_wait;
pthread_create;
pthread_detach;
pthread_exit;
pthread_getspecific;
pthread_join;
pthread_key_create;

16
nptl/forward.c
View File

@ -41,17 +41,6 @@ name decl \
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)
@ -103,11 +92,6 @@ versioned_symbol (libc, __pthread_cond_timedwait, pthread_cond_timedwait,
GLIBC_2_3_2);
FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval),
exit (EXIT_SUCCESS))
strong_alias (__pthread_exit, pthread_exit);
FORWARD (pthread_mutex_destroy, (pthread_mutex_t *mutex), (mutex), 0)
FORWARD (pthread_mutex_init,

1
nptl/nptl-init.c
View File

@ -80,7 +80,6 @@ static const struct pthread_functions pthread_functions =
.ptr___pthread_cond_wait_2_0 = __pthread_cond_wait_2_0,
.ptr___pthread_cond_timedwait_2_0 = __pthread_cond_timedwait_2_0,
# endif
.ptr___pthread_exit = __pthread_exit,
.ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
.ptr_pthread_mutex_init = __pthread_mutex_init,
.ptr_pthread_mutex_lock = __pthread_mutex_lock,

1
nptl/pthreadP.h
View File

@ -535,6 +535,7 @@ extern int __pthread_detach (pthread_t th);
extern int __pthread_cancel (pthread_t th);
extern int __pthread_kill (pthread_t threadid, int signo);
extern void __pthread_exit (void *value) __attribute__ ((__noreturn__));
libc_hidden_proto (__pthread_exit)
extern int __pthread_join (pthread_t threadid, void **thread_return);
extern int __pthread_setcanceltype (int type, int *oldtype);
extern int __pthread_enable_asynccancel (void) attribute_hidden;

9
nptl/pthread_exit.c
View File

@ -36,8 +36,11 @@ __pthread_exit (void *value)
__do_cancel ();
}
libc_hidden_def (__pthread_exit)
weak_alias (__pthread_exit, pthread_exit)
/* After a thread terminates, __libc_start_main decrements
__nptl_nthreads defined in pthread_create.c. */
PTHREAD_STATIC_FN_REQUIRE (__pthread_create)
/* Ensure that the unwinder is always linked in (the __pthread_unwind
reference from __do_cancel is weak). Use ___pthread_unwind_next
(three underscores) to produce a strong reference to the same
file. */
PTHREAD_STATIC_FN_REQUIRE (___pthread_unwind_next)

19
nptl/tst-pthread_exit-nothreads-static.c Normal file
View File

@ -0,0 +1,19 @@
/* Check that pthread_exit works if there are no threads. Static version.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include "tst-pthread_exit-nothreads.c"

28
nptl/tst-pthread_exit-nothreads.c Normal file
View File

@ -0,0 +1,28 @@
/* Check that pthread_exit works if there are no threads.
Copyright (C) 2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <pthread.h>
static int
do_test (void)
{
pthread_exit (NULL);
return 1; /* Not reached. */
}
#include <support/test-driver.c>

1
sysdeps/nptl/pthread-functions.h
View File

@ -41,7 +41,6 @@ struct pthread_functions
int (*ptr___pthread_cond_timedwait_2_0) (pthread_cond_2_0_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 *,
const pthread_mutexattr_t *);

2
sysdeps/pthread/Makefile
View File

@ -111,7 +111,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
# Files which must not be linked with libpthread.
tests-nolibpthread = tst-unload
tests-nolibpthread += tst-unload
# GCC-4.9 compiles 'sprintf(NULL, ...)' into UD2 on x86_64 without -fno-builtin
CFLAGS-tst-cleanup2.c += -fno-builtin

1
sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.17 pthread_condattr_setclock F
GLIBC_2.17 pthread_condattr_setpshared F
GLIBC_2.17 pthread_create F
GLIBC_2.17 pthread_detach F
GLIBC_2.17 pthread_exit F
GLIBC_2.17 pthread_getconcurrency F
GLIBC_2.17 pthread_getcpuclockid F
GLIBC_2.17 pthread_getname_np F

1
sysdeps/unix/sysv/linux/alpha/libpthread.abilist
View File

@ -25,7 +25,6 @@ GLIBC_2.0 pthread_cond_timedwait F
GLIBC_2.0 pthread_cond_wait F
GLIBC_2.0 pthread_create F
GLIBC_2.0 pthread_detach F
GLIBC_2.0 pthread_exit F
GLIBC_2.0 pthread_getspecific F
GLIBC_2.0 pthread_join F
GLIBC_2.0 pthread_key_create F

1
sysdeps/unix/sysv/linux/arc/libpthread.abilist
View File

@ -71,7 +71,6 @@ GLIBC_2.32 pthread_condattr_setclock F
GLIBC_2.32 pthread_condattr_setpshared F
GLIBC_2.32 pthread_create F
GLIBC_2.32 pthread_detach F
GLIBC_2.32 pthread_exit F
GLIBC_2.32 pthread_getattr_default_np F
GLIBC_2.32 pthread_getconcurrency F
GLIBC_2.32 pthread_getcpuclockid F

1
sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
View File

@ -90,7 +90,6 @@ GLIBC_2.4 pthread_condattr_setclock F
GLIBC_2.4 pthread_condattr_setpshared F
GLIBC_2.4 pthread_create F
GLIBC_2.4 pthread_detach F
GLIBC_2.4 pthread_exit F
GLIBC_2.4 pthread_getconcurrency F
GLIBC_2.4 pthread_getcpuclockid F
GLIBC_2.4 pthread_getspecific F

1
sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
View File

@ -90,7 +90,6 @@ GLIBC_2.4 pthread_condattr_setclock F
GLIBC_2.4 pthread_condattr_setpshared F
GLIBC_2.4 pthread_create F
GLIBC_2.4 pthread_detach F
GLIBC_2.4 pthread_exit F
GLIBC_2.4 pthread_getconcurrency F
GLIBC_2.4 pthread_getcpuclockid F
GLIBC_2.4 pthread_getspecific F

1
sysdeps/unix/sysv/linux/csky/libpthread.abilist
View File

@ -69,7 +69,6 @@ GLIBC_2.29 pthread_condattr_setclock F
GLIBC_2.29 pthread_condattr_setpshared F
GLIBC_2.29 pthread_create F
GLIBC_2.29 pthread_detach F
GLIBC_2.29 pthread_exit F
GLIBC_2.29 pthread_getattr_default_np F
GLIBC_2.29 pthread_getconcurrency F
GLIBC_2.29 pthread_getcpuclockid F

1
sysdeps/unix/sysv/linux/hppa/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.2 pthread_condattr_getpshared F
GLIBC_2.2 pthread_condattr_setpshared F
GLIBC_2.2 pthread_create F
GLIBC_2.2 pthread_detach F
GLIBC_2.2 pthread_exit F
GLIBC_2.2 pthread_getconcurrency F
GLIBC_2.2 pthread_getcpuclockid F
GLIBC_2.2 pthread_getspecific F

1
sysdeps/unix/sysv/linux/i386/libpthread.abilist
View File

@ -25,7 +25,6 @@ GLIBC_2.0 pthread_cond_timedwait F
GLIBC_2.0 pthread_cond_wait F
GLIBC_2.0 pthread_create F
GLIBC_2.0 pthread_detach F
GLIBC_2.0 pthread_exit F
GLIBC_2.0 pthread_getspecific F
GLIBC_2.0 pthread_join F
GLIBC_2.0 pthread_key_create F

1
sysdeps/unix/sysv/linux/ia64/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.2 pthread_condattr_getpshared F
GLIBC_2.2 pthread_condattr_setpshared F
GLIBC_2.2 pthread_create F
GLIBC_2.2 pthread_detach F
GLIBC_2.2 pthread_exit F
GLIBC_2.2 pthread_getconcurrency F
GLIBC_2.2 pthread_getcpuclockid F
GLIBC_2.2 pthread_getspecific F

1
sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
View File

@ -90,7 +90,6 @@ GLIBC_2.4 pthread_condattr_setclock F
GLIBC_2.4 pthread_condattr_setpshared F
GLIBC_2.4 pthread_create F
GLIBC_2.4 pthread_detach F
GLIBC_2.4 pthread_exit F
GLIBC_2.4 pthread_getconcurrency F
GLIBC_2.4 pthread_getcpuclockid F
GLIBC_2.4 pthread_getspecific F

1
sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
View File

@ -25,7 +25,6 @@ GLIBC_2.0 pthread_cond_timedwait F
GLIBC_2.0 pthread_cond_wait F
GLIBC_2.0 pthread_create F
GLIBC_2.0 pthread_detach F
GLIBC_2.0 pthread_exit F
GLIBC_2.0 pthread_getspecific F
GLIBC_2.0 pthread_join F
GLIBC_2.0 pthread_key_create F

1
sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.18 pthread_condattr_setclock F
GLIBC_2.18 pthread_condattr_setpshared F
GLIBC_2.18 pthread_create F
GLIBC_2.18 pthread_detach F
GLIBC_2.18 pthread_exit F
GLIBC_2.18 pthread_getattr_default_np F
GLIBC_2.18 pthread_getconcurrency F
GLIBC_2.18 pthread_getcpuclockid F

1
sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.18 pthread_condattr_setclock F
GLIBC_2.18 pthread_condattr_setpshared F
GLIBC_2.18 pthread_create F
GLIBC_2.18 pthread_detach F
GLIBC_2.18 pthread_exit F
GLIBC_2.18 pthread_getattr_default_np F
GLIBC_2.18 pthread_getconcurrency F
GLIBC_2.18 pthread_getcpuclockid F

1
sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
View File

@ -25,7 +25,6 @@ GLIBC_2.0 pthread_cond_timedwait F
GLIBC_2.0 pthread_cond_wait F
GLIBC_2.0 pthread_create F
GLIBC_2.0 pthread_detach F
GLIBC_2.0 pthread_exit F
GLIBC_2.0 pthread_getspecific F
GLIBC_2.0 pthread_join F
GLIBC_2.0 pthread_key_create F

1
sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
View File

@ -25,7 +25,6 @@ GLIBC_2.0 pthread_cond_timedwait F
GLIBC_2.0 pthread_cond_wait F
GLIBC_2.0 pthread_create F
GLIBC_2.0 pthread_detach F
GLIBC_2.0 pthread_exit F
GLIBC_2.0 pthread_getspecific F
GLIBC_2.0 pthread_join F
GLIBC_2.0 pthread_key_create F

1
sysdeps/unix/sysv/linux/nios2/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.21 pthread_condattr_setclock F
GLIBC_2.21 pthread_condattr_setpshared F
GLIBC_2.21 pthread_create F
GLIBC_2.21 pthread_detach F
GLIBC_2.21 pthread_exit F
GLIBC_2.21 pthread_getattr_default_np F
GLIBC_2.21 pthread_getconcurrency F
GLIBC_2.21 pthread_getcpuclockid F

1
sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
View File

@ -25,7 +25,6 @@ GLIBC_2.0 pthread_cond_timedwait F
GLIBC_2.0 pthread_cond_wait F
GLIBC_2.0 pthread_create F
GLIBC_2.0 pthread_detach F
GLIBC_2.0 pthread_exit F
GLIBC_2.0 pthread_getspecific F
GLIBC_2.0 pthread_join F
GLIBC_2.0 pthread_key_create F

1
sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
View File

@ -76,7 +76,6 @@ GLIBC_2.3 pthread_condattr_getpshared F
GLIBC_2.3 pthread_condattr_setpshared F
GLIBC_2.3 pthread_create F
GLIBC_2.3 pthread_detach F
GLIBC_2.3 pthread_exit F
GLIBC_2.3 pthread_getconcurrency F
GLIBC_2.3 pthread_getcpuclockid F
GLIBC_2.3 pthread_getspecific F

1
sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.17 pthread_condattr_setclock F
GLIBC_2.17 pthread_condattr_setpshared F
GLIBC_2.17 pthread_create F
GLIBC_2.17 pthread_detach F
GLIBC_2.17 pthread_exit F
GLIBC_2.17 pthread_getconcurrency F
GLIBC_2.17 pthread_getcpuclockid F
GLIBC_2.17 pthread_getname_np F

1
sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
View File

@ -71,7 +71,6 @@ GLIBC_2.33 pthread_condattr_setclock F
GLIBC_2.33 pthread_condattr_setpshared F
GLIBC_2.33 pthread_create F
GLIBC_2.33 pthread_detach F
GLIBC_2.33 pthread_exit F
GLIBC_2.33 pthread_getattr_default_np F
GLIBC_2.33 pthread_getconcurrency F
GLIBC_2.33 pthread_getcpuclockid F

1
sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.27 pthread_condattr_setclock F
GLIBC_2.27 pthread_condattr_setpshared F
GLIBC_2.27 pthread_create F
GLIBC_2.27 pthread_detach F
GLIBC_2.27 pthread_exit F
GLIBC_2.27 pthread_getattr_default_np F
GLIBC_2.27 pthread_getconcurrency F
GLIBC_2.27 pthread_getcpuclockid F

1
sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
View File

@ -25,7 +25,6 @@ GLIBC_2.0 pthread_cond_timedwait F
GLIBC_2.0 pthread_cond_wait F
GLIBC_2.0 pthread_create F
GLIBC_2.0 pthread_detach F
GLIBC_2.0 pthread_exit F
GLIBC_2.0 pthread_getspecific F
GLIBC_2.0 pthread_join F
GLIBC_2.0 pthread_key_create F

1
sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
View File

@ -57,7 +57,6 @@ GLIBC_2.2 pthread_condattr_getpshared F
GLIBC_2.2 pthread_condattr_setpshared F
GLIBC_2.2 pthread_create F
GLIBC_2.2 pthread_detach F
GLIBC_2.2 pthread_exit F
GLIBC_2.2 pthread_getconcurrency F
GLIBC_2.2 pthread_getcpuclockid F
GLIBC_2.2 pthread_getspecific F

1
sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.2 pthread_condattr_getpshared F
GLIBC_2.2 pthread_condattr_setpshared F
GLIBC_2.2 pthread_create F
GLIBC_2.2 pthread_detach F
GLIBC_2.2 pthread_exit F
GLIBC_2.2 pthread_getconcurrency F
GLIBC_2.2 pthread_getcpuclockid F
GLIBC_2.2 pthread_getspecific F

1
sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.2 pthread_condattr_getpshared F
GLIBC_2.2 pthread_condattr_setpshared F
GLIBC_2.2 pthread_create F
GLIBC_2.2 pthread_detach F
GLIBC_2.2 pthread_exit F
GLIBC_2.2 pthread_getconcurrency F
GLIBC_2.2 pthread_getcpuclockid F
GLIBC_2.2 pthread_getspecific F

1
sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
View File

@ -25,7 +25,6 @@ GLIBC_2.0 pthread_cond_timedwait F
GLIBC_2.0 pthread_cond_wait F
GLIBC_2.0 pthread_create F
GLIBC_2.0 pthread_detach F
GLIBC_2.0 pthread_exit F
GLIBC_2.0 pthread_getspecific F
GLIBC_2.0 pthread_join F
GLIBC_2.0 pthread_key_create F

1
sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.2 pthread_condattr_getpshared F
GLIBC_2.2 pthread_condattr_setpshared F
GLIBC_2.2 pthread_create F
GLIBC_2.2 pthread_detach F
GLIBC_2.2 pthread_exit F
GLIBC_2.2 pthread_getconcurrency F
GLIBC_2.2 pthread_getcpuclockid F
GLIBC_2.2 pthread_getspecific F

1
sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.2.5 pthread_condattr_getpshared F
GLIBC_2.2.5 pthread_condattr_setpshared F
GLIBC_2.2.5 pthread_create F
GLIBC_2.2.5 pthread_detach F
GLIBC_2.2.5 pthread_exit F
GLIBC_2.2.5 pthread_getconcurrency F
GLIBC_2.2.5 pthread_getcpuclockid F
GLIBC_2.2.5 pthread_getspecific F

1
sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
View File

@ -56,7 +56,6 @@ GLIBC_2.16 pthread_condattr_setclock F
GLIBC_2.16 pthread_condattr_setpshared F
GLIBC_2.16 pthread_create F
GLIBC_2.16 pthread_detach F
GLIBC_2.16 pthread_exit F
GLIBC_2.16 pthread_getconcurrency F
GLIBC_2.16 pthread_getcpuclockid F
GLIBC_2.16 pthread_getname_np F