AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

nptl: Move __pthread_keys global variable into libc

Browse Source 
This prepares moving pthread_exit, and later the pthread_key_create
infrastructure.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2021-04-21 19:49:50 +02:00
parent 7a7229de1d
commit a91bf4e0ff
6 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nptl/Makefile
View File

@ -76,6 +76,7 @@ routines = \
pthread_getaffinity \ pthread_getaffinity \
pthread_getattr_np \ pthread_getattr_np \
pthread_getschedparam \ pthread_getschedparam \
pthread_keys \
pthread_kill \ pthread_kill \
pthread_mutex_consistent \ pthread_mutex_consistent \
pthread_once \ pthread_once \

1
nptl/Versions
View File

@ -119,6 +119,7 @@ libc {
__pthread_cond_init; # Used by the C11 threads. __pthread_cond_init; # Used by the C11 threads.
__pthread_force_elision; __pthread_force_elision;
__pthread_getattr_default_np; __pthread_getattr_default_np;
__pthread_keys;
__pthread_unwind; __pthread_unwind;
} }
} }

2
nptl/pthreadP.h
View File

@ -217,7 +217,7 @@ extern int __concurrency_level attribute_hidden;
/* Thread-local data key handling. */ /* Thread-local data key handling. */
extern struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX]; extern struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX];
hidden_proto (__pthread_keys) libc_hidden_proto (__pthread_keys)
/* Number of threads running. */ /* Number of threads running. */
extern unsigned int __nptl_nthreads; extern unsigned int __nptl_nthreads;

24
nptl/pthread_keys.c Normal file
View File

@ -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)

5
nptl/vars.c
View File

@ -33,8 +33,3 @@ int __default_pthread_attr_lock = LLL_LOCK_INITIALIZER;
nptl/descr.h for more context on the single-threaded process case. */ nptl/descr.h for more context on the single-threaded process case. */
int __pthread_multiple_threads attribute_hidden; int __pthread_multiple_threads attribute_hidden;
#endif #endif
/* Table of the key information. */
struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX]
__attribute__ ((nocommon));
hidden_data_def (__pthread_keys)

2
nptl_db/structs.def
View File

@ -82,7 +82,7 @@ DB_MAIN_VARIABLE (__nptl_nthreads)
DB_VARIABLE (__nptl_last_event) DB_VARIABLE (__nptl_last_event)
DB_VARIABLE (__nptl_initial_report_events) DB_VARIABLE (__nptl_initial_report_events)
DB_ARRAY_VARIABLE (__pthread_keys) DB_MAIN_ARRAY_VARIABLE (__pthread_keys)
DB_STRUCT (pthread_key_struct) DB_STRUCT (pthread_key_struct)
DB_STRUCT_FIELD (pthread_key_struct, seq) DB_STRUCT_FIELD (pthread_key_struct, seq)
DB_STRUCT_FIELD (pthread_key_struct, destr) DB_STRUCT_FIELD (pthread_key_struct, destr)