lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code 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
Download Patch File Download Diff File Expand all files Collapse all files

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