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

Clean up __exit_thread.

Browse Source
This commit is contained in:
Roland McGrath 2014-05-13 09:49:20 -07:00
parent 01eb16fdb6
commit e0db65176f
23 changed files with 82 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ChangeLog
View File

@ -1,3 +1,31 @@
2014-05-13 Roland McGrath <roland@hack.frob.com>
* sysdeps/generic/exit-thread.h: New file.
* sysdeps/unix/sysv/linux/exit-thread.h: New file.
* include/unistd.h (__exit_thread): Remove declaration.
* sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Drop exit-thread.
* sysdeps/unix/sysv/linux/exit-thread.S: File removed.
* csu/libc-start.c: Include <exit-thread.h>.
(LIBC_START_MAIN): Pass no argument to __exit_thread.
* nptl/pthread_create.c: Include <exit-thread.h>.
(start_thread): Call __exit_thread in place of __exit_thread_inline.
* nptl/sysdeps/i386/pthreaddef.h (__exit_thread_inline): Macro removed.
* nptl/sysdeps/powerpc/pthreaddef.h: Likewise.
* nptl/sysdeps/s390/pthreaddef.h: Likewise.
* nptl/sysdeps/sh/pthreaddef.h: Likewise.
* nptl/sysdeps/sparc/sparc32/pthreaddef.h: Likewise.
* nptl/sysdeps/sparc/sparc64/pthreaddef.h: Likewise.
* nptl/sysdeps/x86_64/pthreaddef.h: Likewise.
* sysdeps/aarch64/nptl/pthreaddef.h: Likewise.
* sysdeps/alpha/nptl/pthreaddef.h: Likewise.
* sysdeps/arm/nptl/pthreaddef.h: Likewise.
* sysdeps/hppa/nptl/pthreaddef.h: Likewise.
* sysdeps/ia64/nptl/pthreaddef.h: Likewise.
* sysdeps/m68k/nptl/pthreaddef.h: Likewise.
* sysdeps/microblaze/nptl/pthreaddef.h: Likewise.
* sysdeps/mips/nptl/pthreaddef.h: Likewise.
* sysdeps/tile/nptl/pthreaddef.h: Likewise.
2014-05-13 Andreas Schwab <schwab@suse.de>
* sysdeps/unix/grantpt.c (grantpt): Fix typo in assertion.

3
csu/libc-start.c
View File

@ -20,6 +20,7 @@
#include <stdio.h>
#include <unistd.h>
#include <ldsodefs.h>
#include <exit-thread.h>
extern void __libc_init_first (int argc, char **argv, char **envp);
#ifndef SHARED
@ -312,7 +313,7 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
if (! atomic_decrement_and_test (ptr))
/* Not much left to do but to exit the thread, not the process. */
__exit_thread (0);
__exit_thread ();
}
#else
/* Nothing fancy, just call the function. */

3
include/unistd.h
View File

@ -161,9 +161,6 @@ extern int __libc_enable_secure_internal attribute_relro attribute_hidden;
extern void __libc_check_standard_fds (void);
/* Special exit function which only terminates the current thread. */
extern void __exit_thread (int val) __attribute__ ((noreturn));
/* Internal name for fork function. */
extern __pid_t __libc_fork (void);

3
nptl/pthread_create.c
View File

@ -29,6 +29,7 @@
#include <libc-internal.h>
#include <resolv.h>
#include <kernel-features.h>
#include <exit-thread.h>
#include <shlib-compat.h>
@ -432,7 +433,7 @@ start_thread (void *arg)
The exit code is zero since in case all threads exit by calling
'pthread_exit' the exit status must be 0 (zero). */
__exit_thread_inline (0);
__exit_thread ();
/* NOTREACHED */
return 0;

13
nptl/sysdeps/i386/pthreaddef.h
View File

@ -38,16 +38,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME __builtin_frame_address (0)
/* XXX Until we have a better place keep the definitions here. */
/* While there is no such syscall. */
#define __exit_thread_inline(val) \
while (1) { \
if (__builtin_constant_p (val) && (val) == 0) \
asm volatile ("xorl %%ebx, %%ebx; int $0x80" :: "a" (__NR_exit)); \
else \
asm volatile ("movl %1, %%ebx; int $0x80" \
:: "a" (__NR_exit), "r" (val)); \
}

7
nptl/sysdeps/powerpc/pthreaddef.h
View File

@ -31,10 +31,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME __builtin_frame_address (0)
/* XXX Until we have a better place keep the definitions here. */
/* While there is no such syscall. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

7
nptl/sysdeps/s390/pthreaddef.h
View File

@ -31,10 +31,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME __builtin_frame_address (0)
/* XXX Until we have a better place keep the definitions here. */
/* While there is no such syscall. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

14
nptl/sysdeps/sh/pthreaddef.h
View File

@ -32,17 +32,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME __builtin_frame_address (0)
/* XXX Until we have a better place keep the definitions here. */
/* While there is no such syscall. */
#define __exit_thread_inline(val) \
while (1) { \
if (__builtin_constant_p (val) && (val) == 0) \
asm volatile ("mov #0,r4; mov %0,r3; trapa #0x11\n\t" SYSCALL_INST_PAD \
:: "i" (__NR_exit)); \
else \
asm volatile ("mov %1,r4; mov %0,r3; trapa #0x11\n\t" SYSCALL_INST_PAD \
:: "i" (__NR_exit), "r" (val)); \
}

6
nptl/sysdeps/sparc/sparc32/pthreaddef.h
View File

@ -31,9 +31,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME (stack_pointer + (2 * 64))
register char *stack_pointer __asm__("%sp");
/* XXX Until we have a better place keep the definitions here. */
/* While there is no such syscall. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

6
nptl/sysdeps/sparc/sparc64/pthreaddef.h
View File

@ -31,9 +31,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME (stack_pointer + (2 * 128))
register char *stack_pointer __asm__("%sp");
/* XXX Until we have a better place keep the definitions here. */
/* While there is no such syscall. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

7
nptl/sysdeps/x86_64/pthreaddef.h
View File

@ -42,10 +42,3 @@
/* Location of current stack frame. The frame pointer is not usable. */
#define CURRENT_STACK_FRAME \
({ register char *frame __asm__("rsp"); frame; })
/* XXX Until we have a better place keep the definitions here. */
/* While there is no such syscall. */
#define __exit_thread_inline(val) \
asm volatile ("syscall" :: "a" (__NR_exit), "D" (val))

5
sysdeps/aarch64/nptl/pthreaddef.h
View File

@ -30,8 +30,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME __builtin_frame_address (0)
/* XXX Until we have a better place keep the definitions here. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

6
sysdeps/alpha/nptl/pthreaddef.h
View File

@ -29,9 +29,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME __builtin_frame_address (0)
/* XXX Until we have a better place keep the definitions here. */
/* While there is no such syscall. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

5
sysdeps/arm/nptl/pthreaddef.h
View File

@ -39,8 +39,3 @@
return the hard FP minus 12. Of course, this makes no sense
without the obsolete APCS stack layout... */
#define CURRENT_STACK_FRAME (__builtin_frame_address (0) - 12)
/* XXX Until we have a better place keep the definitions here. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

16
sysdeps/unix/sysv/linux/exit-thread.S → sysdeps/generic/exit-thread.h
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1991-2014 Free Software Foundation, Inc.
/* Call to terminate the current thread. Stub version.
Copyright (C) 2014 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
@ -15,8 +16,13 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <sysdep.h>
/* This causes the current thread to exit, without affecting other
threads in the process if there are any. If there are no other
threads left, then this has the effect of _exit (0). */
PSEUDO (__exit_thread, exit, 1)
/* Shouldn't get here. */
PSEUDO_END(__exit_thread)
static inline void __attribute__ ((noreturn, always_inline, unused))
__exit_thread (void)
{
while (1)
asm ("write me!");
}

6
sysdeps/hppa/nptl/pthreaddef.h
View File

@ -31,9 +31,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME stack_pointer
register char * stack_pointer __asm__ ("%r30");
/* XXX Until we have a better place keep the definitions here. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

6
sysdeps/ia64/nptl/pthreaddef.h
View File

@ -34,9 +34,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME __stack_pointer
register char *__stack_pointer __asm__ ("sp");
/* XXX Until we have a better place keep the definitions here. */
/* While there is no such syscall. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

5
sysdeps/m68k/nptl/pthreaddef.h
View File

@ -31,8 +31,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME __builtin_frame_address (0)
/* XXX Until we have a better place keep the definitions here. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

5
sysdeps/microblaze/nptl/pthreaddef.h
View File

@ -33,8 +33,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME __builtin_frame_address (0)
/* XXX Until we have a better place keep the definitions here. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

6
sysdeps/mips/nptl/pthreaddef.h
View File

@ -30,9 +30,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME __builtin_frame_address (0)
/* XXX Until we have a better place keep the definitions here. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

5
sysdeps/tile/nptl/pthreaddef.h
View File

@ -34,8 +34,3 @@
/* Location of current stack frame. */
#define CURRENT_STACK_FRAME __builtin_frame_address (0)
/* XXX Until we have a better place keep the definitions here. */
#define __exit_thread_inline(val) \
INLINE_SYSCALL (exit, 1, (val))

2
sysdeps/unix/sysv/linux/Makefile
View File

@ -141,7 +141,7 @@ endif
ifeq ($(subdir),posix)
sysdep_headers += bits/initspin.h
sysdep_routines += exit-thread sched_getcpu
sysdep_routines += sched_getcpu
tests += tst-getcpu
endif

38
sysdeps/unix/sysv/linux/exit-thread.h Normal file
View File

@ -0,0 +1,38 @@
/* Call to terminate the current thread. Linux version.
Copyright (C) 2014 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
<http://www.gnu.org/licenses/>. */
#include <sysdep.h>
/* This causes the current thread to exit, without affecting other
threads in the process if there are any. If there are no other
threads left, then this has the effect of _exit (0). */
static inline void __attribute__ ((noreturn, always_inline, unused))
__exit_thread (void)
{
/* Doing this in a loop is mostly just to satisfy the compiler that the
function really qualifies as noreturn. It also means that in some
pathological situation where the system call does not get made or does
not work, the thread will simply spin rather than running off the end
of the caller and doing unexpectedly strange things. */
while (1)
{
INTERNAL_SYSCALL_DECL (err);
INTERNAL_SYSCALL (exit, err, 1, 0);
}
}