generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 7e202e4e: Merge "Remove t->tls==NULL check in pthread_key_delete."

Browse Source 
* commit '7e202e4eb150158e505859b506e4aa3706a14497':
  Remove t->tls==NULL check in pthread_key_delete.
This commit is contained in:
Yabin Cui
2014-12-20 00:48:38 +00:00
committed by Android Git Automerger
parent da2317edb3 7e202e4eb1
commit a62755adba
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libc/bionic/pthread_key.cpp
View File

@@ -213,16 +213,6 @@ int pthread_key_delete(pthread_key_t key) {
// Clear value in all threads.
pthread_mutex_lock(&g_thread_list_lock);
for (pthread_internal_t* t = g_thread_list; t != NULL; t = t->next) {
// Skip zombie threads. They don't have a valid TLS area any more.
// Similarly, it is possible to have t->tls == NULL for threads that
// were just recently created through pthread_create() but whose
// startup trampoline (__pthread_start) hasn't been run yet by the
// scheduler. t->tls will also be NULL after a thread's stack has been
// unmapped but before the ongoing pthread_join() is finished.
if (t->tid == 0 || t->tls == NULL) {
continue;
}
t->tls[key] = NULL;
}
tls_map.DeleteKey(key);