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

nptl: Eliminate __pthread_multiple_threads 

It is no longer needed after the SINGLE_THREADED_P consolidation.

Tested-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Florian Weimer 2021-05-10 10:31:41 +02:00
parent 29d4d1be68
commit 0df5d8d404
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nptl/allocatestack.c
View File

@ -477,7 +477,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
/* This is at least the second thread. */ /* This is at least the second thread. */
pd->header.multiple_threads = 1; pd->header.multiple_threads = 1;
#ifndef TLS_MULTIPLE_THREADS_IN_TCB #ifndef TLS_MULTIPLE_THREADS_IN_TCB
__pthread_multiple_threads = __libc_multiple_threads = 1; __libc_multiple_threads = 1;
#endif #endif
#ifdef NEED_DL_SYSINFO #ifdef NEED_DL_SYSINFO
@ -598,7 +598,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
/* This is at least the second thread. */ /* This is at least the second thread. */
pd->header.multiple_threads = 1; pd->header.multiple_threads = 1;
#ifndef TLS_MULTIPLE_THREADS_IN_TCB #ifndef TLS_MULTIPLE_THREADS_IN_TCB
__pthread_multiple_threads = __libc_multiple_threads = 1; __libc_multiple_threads = 1;
#endif #endif
#ifdef NEED_DL_SYSINFO #ifdef NEED_DL_SYSINFO

7
nptl/pthreadP.h
View File

@ -370,13 +370,6 @@ extern unsigned long int *__fork_generation_pointer attribute_hidden;
/* Register the generation counter in the libpthread with the libc. */ /* Register the generation counter in the libpthread with the libc. */
extern void __libc_pthread_init (void (*reclaim) (void)); extern void __libc_pthread_init (void (*reclaim) (void));
#ifndef TLS_MULTIPLE_THREADS_IN_TCB
/* Variable set to a nonzero value either if more than one thread runs or ran,
or if a single-threaded process is trying to cancel itself. See
nptl/descr.h for more context on the single-threaded process case. */
extern int __pthread_multiple_threads attribute_hidden;
#endif
extern size_t __pthread_get_minstack (const pthread_attr_t *attr); extern size_t __pthread_get_minstack (const pthread_attr_t *attr);
/* Namespace save aliases. */ /* Namespace save aliases. */

2
nptl/pthread_cancel.c
View File

@ -90,7 +90,7 @@ __pthread_cancel (pthread_t th)
points get executed. */ points get executed. */
THREAD_SETMEM (THREAD_SELF, header.multiple_threads, 1); THREAD_SETMEM (THREAD_SELF, header.multiple_threads, 1);
#ifndef TLS_MULTIPLE_THREADS_IN_TCB #ifndef TLS_MULTIPLE_THREADS_IN_TCB
__pthread_multiple_threads = __libc_multiple_threads = 1; __libc_multiple_threads = 1;
#endif #endif
} }
/* Mark the thread as canceled. This has to be done /* Mark the thread as canceled. This has to be done

7
nptl/vars.c
View File

@ -26,10 +26,3 @@ union pthread_attr_transparent __default_pthread_attr attribute_hidden;
/* Mutex protecting __default_pthread_attr. */ /* Mutex protecting __default_pthread_attr. */
int __default_pthread_attr_lock = LLL_LOCK_INITIALIZER; int __default_pthread_attr_lock = LLL_LOCK_INITIALIZER;
#ifndef TLS_MULTIPLE_THREADS_IN_TCB
/* Variable set to a nonzero value either if more than one thread runs or ran,
or if a single-threaded process is trying to cancel itself. See
nptl/descr.h for more context on the single-threaded process case. */
int __pthread_multiple_threads attribute_hidden;
#endif