mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 17:53:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nptl: Move __nptl_deallocate_tsd 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 a91bf4e0ff
commit 2cfef0b042
8 changed files with 116 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nptl/Makefile
View File

@ -45,6 +45,7 @@ routines = \
libc_multiple_threads \
libc_pthread_init \
lowlevellock \
nptl_deallocate_tsd \
nptl_nthreads \
old_pthread_cond_destroy \
old_pthread_cond_init \

1
nptl/Versions
View File

@ -106,6 +106,7 @@ libc {
__lll_lock_wait_private;
__lll_trylock_elision;
__lll_unlock_elision;
__nptl_deallocate_tsd;
__nptl_nthreads;
__pthread_attr_copy;
__pthread_attr_destroy;

1
nptl/nptl-init.c
View File

@ -93,7 +93,6 @@ static const struct pthread_functions pthread_functions =
.ptr___pthread_key_create = __pthread_key_create,
.ptr___pthread_getspecific = __pthread_getspecific,
.ptr___pthread_setspecific = __pthread_setspecific,
.ptr__nptl_deallocate_tsd = __nptl_deallocate_tsd,
.ptr__nptl_setxid = __nptl_setxid,
.ptr_set_robust = __nptl_set_robust
};

112
nptl/nptl_deallocate_tsd.c Normal file
View File

@ -0,0 +1,112 @@
/* Deallocation thread-specific data structures related to pthread_key_create.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
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>
/* Deallocate POSIX thread-local-storage. */
void
__nptl_deallocate_tsd (void)
{
struct pthread *self = THREAD_SELF;
/* Maybe no data was ever allocated. This happens often so we have
a flag for this. */
if (THREAD_GETMEM (self, specific_used))
{
size_t round;
size_t cnt;
round = 0;
do
{
size_t idx;
/* So far no new nonzero data entry. */
THREAD_SETMEM (self, specific_used, false);
for (cnt = idx = 0; cnt < PTHREAD_KEY_1STLEVEL_SIZE; ++cnt)
{
struct pthread_key_data *level2;
level2 = THREAD_GETMEM_NC (self, specific, cnt);
if (level2 != NULL)
{
size_t inner;
for (inner = 0; inner < PTHREAD_KEY_2NDLEVEL_SIZE;
++inner, ++idx)
{
void *data = level2[inner].data;
if (data != NULL)
{
/* Always clear the data. */
level2[inner].data = NULL;
/* Make sure the data corresponds to a valid
key. This test fails if the key was
deallocated and also if it was
re-allocated. It is the user's
responsibility to free the memory in this
case. */
if (level2[inner].seq
== __pthread_keys[idx].seq
/* It is not necessary to register a destructor
function. */
&& __pthread_keys[idx].destr != NULL)
/* Call the user-provided destructor. */
__pthread_keys[idx].destr (data);
}
}
}
else
idx += PTHREAD_KEY_1STLEVEL_SIZE;
}
if (THREAD_GETMEM (self, specific_used) == 0)
/* No data has been modified. */
goto just_free;
}
/* We only repeat the process a fixed number of times. */
while (__builtin_expect (++round < PTHREAD_DESTRUCTOR_ITERATIONS, 0));
/* Just clear the memory of the first block for reuse. */
memset (&THREAD_SELF->specific_1stblock, '\0',
sizeof (self->specific_1stblock));
just_free:
/* Free the memory for the other blocks. */
for (cnt = 1; cnt < PTHREAD_KEY_1STLEVEL_SIZE; ++cnt)
{
struct pthread_key_data *level2;
level2 = THREAD_GETMEM_NC (self, specific, cnt);
if (level2 != NULL)
{
/* The first block is allocated as part of the thread
descriptor. */
free (level2);
THREAD_SETMEM_NC (self, specific, cnt, NULL);
}
}
THREAD_SETMEM (self, specific_used, false);
}
}
libc_hidden_def (__nptl_deallocate_tsd)

3
nptl/pthreadP.h
View File

@ -686,7 +686,8 @@ extern void _pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer,
extern void _pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer,
int execute);
extern void __nptl_deallocate_tsd (void) attribute_hidden;
extern void __nptl_deallocate_tsd (void);
libc_hidden_proto (__nptl_deallocate_tsd)
extern void __nptl_setxid_error (struct xid_command *cmdp, int error)
attribute_hidden;

94
nptl/pthread_create.c
View File

@ -250,100 +250,6 @@ __find_in_stack_list (struct pthread *pd)
}
/* Deallocate POSIX thread-local-storage. */
void
attribute_hidden
__nptl_deallocate_tsd (void)
{
struct pthread *self = THREAD_SELF;
/* Maybe no data was ever allocated. This happens often so we have
a flag for this. */
if (THREAD_GETMEM (self, specific_used))
{
size_t round;
size_t cnt;
round = 0;
do
{
size_t idx;
/* So far no new nonzero data entry. */
THREAD_SETMEM (self, specific_used, false);
for (cnt = idx = 0; cnt < PTHREAD_KEY_1STLEVEL_SIZE; ++cnt)
{
struct pthread_key_data *level2;
level2 = THREAD_GETMEM_NC (self, specific, cnt);
if (level2 != NULL)
{
size_t inner;
for (inner = 0; inner < PTHREAD_KEY_2NDLEVEL_SIZE;
++inner, ++idx)
{
void *data = level2[inner].data;
if (data != NULL)
{
/* Always clear the data. */
level2[inner].data = NULL;
/* Make sure the data corresponds to a valid
key. This test fails if the key was
deallocated and also if it was
re-allocated. It is the user's
responsibility to free the memory in this
case. */
if (level2[inner].seq
== __pthread_keys[idx].seq
/* It is not necessary to register a destructor
function. */
&& __pthread_keys[idx].destr != NULL)
/* Call the user-provided destructor. */
__pthread_keys[idx].destr (data);
}
}
}
else
idx += PTHREAD_KEY_1STLEVEL_SIZE;
}
if (THREAD_GETMEM (self, specific_used) == 0)
/* No data has been modified. */
goto just_free;
}
/* We only repeat the process a fixed number of times. */
while (__builtin_expect (++round < PTHREAD_DESTRUCTOR_ITERATIONS, 0));
/* Just clear the memory of the first block for reuse. */
memset (&THREAD_SELF->specific_1stblock, '\0',
sizeof (self->specific_1stblock));
just_free:
/* Free the memory for the other blocks. */
for (cnt = 1; cnt < PTHREAD_KEY_1STLEVEL_SIZE; ++cnt)
{
struct pthread_key_data *level2;
level2 = THREAD_GETMEM_NC (self, specific, cnt);
if (level2 != NULL)
{
/* The first block is allocated as part of the thread
descriptor. */
free (level2);
THREAD_SETMEM_NC (self, specific, cnt, NULL);
}
}
THREAD_SETMEM (self, specific_used, false);
}
}
/* Deallocate a thread's stack after optionally making sure the thread
descriptor is still valid. */
void

5
sysdeps/nptl/libc_start_call_main.h
View File

@ -60,12 +60,7 @@ __libc_start_call_main (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
else
{
/* Remove the thread-local data. */
# ifdef SHARED
PTHFCT_CALL (ptr__nptl_deallocate_tsd, ());
# else
extern void __nptl_deallocate_tsd (void) __attribute ((weak));
__nptl_deallocate_tsd ();
# endif
/* One less thread. Decrement the counter. If it is zero we
terminate the entire process. */

1
sysdeps/nptl/pthread-functions.h
View File

@ -55,7 +55,6 @@ struct pthread_functions
int (*ptr___pthread_key_create) (pthread_key_t *, void (*) (void *));
void *(*ptr___pthread_getspecific) (pthread_key_t);
int (*ptr___pthread_setspecific) (pthread_key_t, const void *);
void (*ptr__nptl_deallocate_tsd) (void);
int (*ptr__nptl_setxid) (struct xid_command *);
void (*ptr_set_robust) (struct pthread *);
};