From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH v4 13/37] nptl: Move __pthread_keys global variable into libc
Date: Fri, 16 Apr 2021 11:21:30 +0200 [thread overview]
Message-ID: <854cfa979e9f1ba6a5135df53f2786bdf0301f08.1618564630.git.fweimer@redhat.com> (raw)
In-Reply-To: <cover.1618564630.git.fweimer@redhat.com>
This prepares moving pthread_exit, and later the pthread_key_create
infrastructure.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
---
nptl/Makefile | 1 +
nptl/Versions | 1 +
nptl/pthreadP.h | 2 +-
nptl/pthread_keys.c | 24 ++++++++++++++++++++++++
nptl/vars.c | 5 -----
nptl_db/structs.def | 2 +-
6 files changed, 28 insertions(+), 7 deletions(-)
create mode 100644 nptl/pthread_keys.c
diff --git a/nptl/Makefile b/nptl/Makefile
index 5bfa721596..ab2c57ad0b 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -76,6 +76,7 @@ routines = \
pthread_getaffinity \
pthread_getattr_np \
pthread_getschedparam \
+ pthread_keys \
pthread_kill \
pthread_mutex_consistent \
pthread_once \
diff --git a/nptl/Versions b/nptl/Versions
index b4ee1bf309..51f8d65bf9 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -119,6 +119,7 @@ libc {
__pthread_cond_init; # Used by the C11 threads.
__pthread_force_elision;
__pthread_getattr_default_np;
+ __pthread_keys;
__pthread_unwind;
}
}
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 64ec71c23f..c6f95c70a1 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -217,7 +217,7 @@ extern int __concurrency_level attribute_hidden;
/* Thread-local data key handling. */
extern struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX];
-hidden_proto (__pthread_keys)
+libc_hidden_proto (__pthread_keys)
/* Number of threads running. */
extern unsigned int __nptl_nthreads;
diff --git a/nptl/pthread_keys.c b/nptl/pthread_keys.c
new file mode 100644
index 0000000000..76e4cfad34
--- /dev/null
+++ b/nptl/pthread_keys.c
@@ -0,0 +1,24 @@
+/* Table of pthread_key_create keys and their destructors.
+ Copyright (C) 2004-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 <pthreadP.h>
+
+/* Table of the key information. */
+struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX]
+ __attribute__ ((nocommon));
+libc_hidden_data_def (__pthread_keys)
diff --git a/nptl/vars.c b/nptl/vars.c
index 51de9fbd54..8de30856b8 100644
--- a/nptl/vars.c
+++ b/nptl/vars.c
@@ -33,8 +33,3 @@ int __default_pthread_attr_lock = LLL_LOCK_INITIALIZER;
nptl/descr.h for more context on the single-threaded process case. */
int __pthread_multiple_threads attribute_hidden;
#endif
-
-/* Table of the key information. */
-struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX]
- __attribute__ ((nocommon));
-hidden_data_def (__pthread_keys)
diff --git a/nptl_db/structs.def b/nptl_db/structs.def
index 1522c96f8f..33bf0f9be4 100644
--- a/nptl_db/structs.def
+++ b/nptl_db/structs.def
@@ -82,7 +82,7 @@ DB_MAIN_VARIABLE (__nptl_nthreads)
DB_VARIABLE (__nptl_last_event)
DB_VARIABLE (__nptl_initial_report_events)
-DB_ARRAY_VARIABLE (__pthread_keys)
+DB_MAIN_ARRAY_VARIABLE (__pthread_keys)
DB_STRUCT (pthread_key_struct)
DB_STRUCT_FIELD (pthread_key_struct, seq)
DB_STRUCT_FIELD (pthread_key_struct, destr)
--
2.30.2
next prev parent reply other threads:[~2021-04-16 9:21 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 9:20 [PATCH v4 00/37] libpthread: Remove NPTL forwarders Florian Weimer
2021-04-16 9:20 ` [PATCH v4 01/37] nptl: Move pthread_mutex_consistent into libc Florian Weimer
2021-04-16 9:20 ` [PATCH v4 02/37] nptl: Move __pthread_cleanup_routine " Florian Weimer
2021-04-16 9:20 ` [PATCH v4 03/37] nptl: Move legacy unwinding implementation " Florian Weimer
2021-04-16 9:20 ` [PATCH v4 04/37] nptl: Move legacy cancelation handling into libc as compat symbols Florian Weimer
2021-04-16 9:20 ` [PATCH v4 05/37] nptl: Remove longjmp, siglongjmp from libpthread Florian Weimer
2021-04-16 9:20 ` [PATCH v4 06/37] x86: Restore compile-time check for shadow stack pointer in longjmp Florian Weimer
2021-04-16 9:20 ` [PATCH v4 07/37] nptl: Move __pthread_cleanup_upto into libc Florian Weimer
2021-04-16 9:20 ` [PATCH v4 08/37] nptl: Move pthread_once and __pthread_once " Florian Weimer
2021-04-16 9:21 ` [PATCH v4 09/37] nptl: Move __pthread_unwind_next " Florian Weimer
2021-04-16 9:21 ` [PATCH v4 10/37] csu: Move calling main out of __libc_start_main_impl Florian Weimer
2021-04-16 9:21 ` [PATCH v4 11/37] nptl: Move internal __nptl_nthreads variable into libc Florian Weimer
2021-04-16 9:21 ` [PATCH v4 12/37] nptl_db: Introduce DB_MAIN_ARRAY_VARIABLE Florian Weimer
2021-04-16 9:21 ` Florian Weimer [this message]
2021-04-16 9:21 ` [PATCH v4 14/37] nptl: Move __nptl_deallocate_tsd into libc Florian Weimer
2021-04-16 9:21 ` [PATCH v4 15/37] nptl: Move pthread_exit " Florian Weimer
2021-04-16 9:22 ` [PATCH v4 16/37] nptl: Move pthread_setcancelstate " Florian Weimer
2021-04-16 9:22 ` [PATCH v4 17/37] nptl: Move pthread_setcanceltype " Florian Weimer
2021-04-16 9:22 ` [PATCH v4 18/37] nptl: Invoke the set_robust_list system call directly in fork Florian Weimer
2021-04-16 9:22 ` [PATCH v4 19/37] dlfcn: Failures after dlmopen should not terminate process [BZ #24772] Florian Weimer
2021-04-16 9:22 ` [PATCH v4 20/37] dlfcn: dlerror needs to call free from the base namespace [BZ #24773] Florian Weimer
2021-04-16 9:22 ` [PATCH v4 21/37] Remove pthread_key_create-related internals from libc-lock.h Florian Weimer
2021-04-16 9:22 ` [PATCH v4 22/37] elf: Introduce __tls_init_tp for second-phase TCB initialization Florian Weimer
2021-04-16 9:22 ` [PATCH v4 23/37] nptl: Move part of TCB initialization from libpthread to __tls_init_tp Florian Weimer
2021-04-16 9:22 ` [PATCH v4 24/37] nptl: Move pthread_key_create, __pthread_key_create into libc Florian Weimer
2021-04-16 9:23 ` [PATCH v4 25/37] nptl: Move pthread_getspecific, __pthread_getspecific " Florian Weimer
2021-04-16 9:23 ` [PATCH v4 26/37] nptl: Move pthread_setspecific, __pthread_setspecific " Florian Weimer
2021-04-16 9:23 ` [PATCH v4 27/37] nptl: Move pthread_key_delete " Florian Weimer
2021-04-16 9:23 ` [PATCH v4 28/37] nptl: Move rwlock functions with forwarders " Florian Weimer
2021-04-16 9:23 ` [PATCH v4 29/37] nptl: Move the internal thread priority protection symbols " Florian Weimer
2021-04-16 9:23 ` [PATCH v4 30/37] pthread: Introduce __pthread_early_init Florian Weimer
2021-04-16 9:23 ` [PATCH v4 31/37] nptl: Move internal symbol __mutex_aconf into libc Florian Weimer
2021-04-16 9:24 ` [PATCH v4 32/37] nptl: pthread_mutex_lock, pthread_mutex_unock single-threaded optimization Florian Weimer
2021-04-16 9:24 ` [PATCH v4 33/37] x86: Remove low-level lock optimization Florian Weimer
2021-04-16 9:24 ` [PATCH v4 34/37] nptl: Move core mutex functions into libc Florian Weimer
2021-04-16 9:24 ` [PATCH v4 35/37] nptl: Move core condition variable " Florian Weimer
2021-04-16 9:24 ` [PATCH v4 36/37] nptl: Move setxid broadcast implementation " Florian Weimer
2021-04-16 9:24 ` [PATCH v4 37/37] nptl: Remove remnants of the libc/libpthread forwarder interface Florian Weimer
2021-04-21 11:47 ` [PATCH v4 00/37] libpthread: Remove NPTL forwarders Florian Weimer
2021-04-21 13:42 ` H.J. Lu
2021-04-22 7:35 ` Szabolcs Nagy
2021-04-22 7:58 ` Florian Weimer
2021-04-22 8:56 ` Szabolcs Nagy
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=854cfa979e9f1ba6a5135df53f2786bdf0301f08.1618564630.git.fweimer@redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@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: link
Be 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).