public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Florian Weimer <fw@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] nptl: Eliminate __pthread_multiple_threads Date: Mon, 10 May 2021 08:39:02 +0000 (GMT) [thread overview] Message-ID: <20210510083902.9C6C5395B803@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0df5d8d404fbf6a7802737b0f9d32ab3376cec86 commit 0df5d8d404fbf6a7802737b0f9d32ab3376cec86 Author: Florian Weimer <fweimer@redhat.com> Date: Mon May 10 10:31:41 2021 +0200 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> Diff: --- nptl/allocatestack.c | 4 ++-- nptl/pthreadP.h | 7 ------- nptl/pthread_cancel.c | 2 +- nptl/vars.c | 7 ------- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 059786192e..88c49f8154 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -477,7 +477,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, /* This is at least the second thread. */ pd->header.multiple_threads = 1; #ifndef TLS_MULTIPLE_THREADS_IN_TCB - __pthread_multiple_threads = __libc_multiple_threads = 1; + __libc_multiple_threads = 1; #endif #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. */ pd->header.multiple_threads = 1; #ifndef TLS_MULTIPLE_THREADS_IN_TCB - __pthread_multiple_threads = __libc_multiple_threads = 1; + __libc_multiple_threads = 1; #endif #ifdef NEED_DL_SYSINFO diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index dd6d6c6342..8ab247f977 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -370,13 +370,6 @@ extern unsigned long int *__fork_generation_pointer attribute_hidden; /* Register the generation counter in the libpthread with the libc. */ 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); /* Namespace save aliases. */ diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c index 2cab8f0a34..fd04bedf6c 100644 --- a/nptl/pthread_cancel.c +++ b/nptl/pthread_cancel.c @@ -90,7 +90,7 @@ __pthread_cancel (pthread_t th) points get executed. */ THREAD_SETMEM (THREAD_SELF, header.multiple_threads, 1); #ifndef TLS_MULTIPLE_THREADS_IN_TCB - __pthread_multiple_threads = __libc_multiple_threads = 1; + __libc_multiple_threads = 1; #endif } /* Mark the thread as canceled. This has to be done diff --git a/nptl/vars.c b/nptl/vars.c index 8de30856b8..03a6cc84be 100644 --- a/nptl/vars.c +++ b/nptl/vars.c @@ -26,10 +26,3 @@ union pthread_attr_transparent __default_pthread_attr attribute_hidden; /* Mutex protecting __default_pthread_attr. */ 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
reply other threads:[~2021-05-10 8:39 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210510083902.9C6C5395B803@sourceware.org \ --to=fw@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).