[v3,13/37] nptl: Move __pthread_keys global variable into libc
Commit Message
This prepares moving pthread_exit, and later the pthread_key_create
infrastructure.
---
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
Comments
On 16/03/2021 14:29, Florian Weimer via Libc-alpha wrote:
> This prepares moving pthread_exit, and later the pthread_key_create
> infrastructure.
LGTM, thanks.
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 d7491632b8..c0ae3593ef 100644
> --- a/nptl/Makefile
> +++ b/nptl/Makefile
> @@ -76,6 +76,7 @@ routines = \
> pthread_getaffinity \
> pthread_getattr_np \
> pthread_getschedparam \
> + pthread_keys \
> pthread_mutex_consistent \
> pthread_once \
> pthread_self \
Ok.
> diff --git a/nptl/Versions b/nptl/Versions
> index 968c4fba35..13198d1e89 100644
> --- a/nptl/Versions
> +++ b/nptl/Versions
> @@ -120,6 +120,7 @@ libc {
> __pthread_cond_init; # Used by the C11 threads.
> __pthread_force_elision;
> __pthread_getattr_default_np;
> + __pthread_keys;
> __pthread_unwind;
> }
> }
Ok.
> diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
> index b136aeae4d..d28610150c 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;
Ok.
> 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)
Ok.
> 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)
Ok.
> 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)
>
Ok.
@@ -76,6 +76,7 @@ routines = \
pthread_getaffinity \
pthread_getattr_np \
pthread_getschedparam \
+ pthread_keys \
pthread_mutex_consistent \
pthread_once \
pthread_self \
@@ -120,6 +120,7 @@ libc {
__pthread_cond_init; # Used by the C11 threads.
__pthread_force_elision;
__pthread_getattr_default_np;
+ __pthread_keys;
__pthread_unwind;
}
}
@@ -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;
new file mode 100644
@@ -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)
@@ -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)
@@ -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)