aboutsummaryrefslogtreecommitdiffstats
path: root/libc/bionic/pthread_key.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-14 17:36:35 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-05-14 17:36:37 +0000
commit15c13bd6cc0ce44d8f083f75d0bfa926a88cc169 (patch)
tree7083cd234073afa5179b94b3d978550c890af90c /libc/bionic/pthread_key.cpp
parentbac795586bbc5dcbe886d8d781710f60c4c19d9b (diff)
parent1728b2396591853345507a063ed6075dfd251706 (diff)
downloadandroid_bionic-15c13bd6cc0ce44d8f083f75d0bfa926a88cc169.tar.gz
android_bionic-15c13bd6cc0ce44d8f083f75d0bfa926a88cc169.tar.bz2
android_bionic-15c13bd6cc0ce44d8f083f75d0bfa926a88cc169.zip
Merge "Switch to g_ for globals."
Diffstat (limited to 'libc/bionic/pthread_key.cpp')
-rw-r--r--libc/bionic/pthread_key.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/bionic/pthread_key.cpp b/libc/bionic/pthread_key.cpp
index 6cc68affe..27eab2706 100644
--- a/libc/bionic/pthread_key.cpp
+++ b/libc/bionic/pthread_key.cpp
@@ -210,8 +210,8 @@ int pthread_key_delete(pthread_key_t key) {
}
// Clear value in all threads.
- pthread_mutex_lock(&gThreadListLock);
- for (pthread_internal_t* t = gThreadList; t != NULL; t = t->next) {
+ 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
@@ -226,7 +226,7 @@ int pthread_key_delete(pthread_key_t key) {
}
tls_map.DeleteKey(key);
- pthread_mutex_unlock(&gThreadListLock);
+ pthread_mutex_unlock(&g_thread_list_lock);
return 0;
}