Changeset 91444 in webkit for trunk/Source/JavaScriptCore/wtf/ThreadIdentifierDataPthreads.cpp

Timestamp:

Jul 20, 2011, 10:04:49 PM (14 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r91380.
​http://trac.webkit.org/changeset/91380
​https://bugs.webkit.org/show_bug.cgi?id=64924

Caused assertion failures in Chromium's IndexedDB tests
(Requested by rniwa on #webkit).

Patch by Sheriff Bot <​[email protected]> on 2011-07-20

• wtf/ThreadIdentifierDataPthreads.cpp:

(WTF::ThreadIdentifierData::identifier):
(WTF::ThreadIdentifierData::initialize):
(WTF::ThreadIdentifierData::initializeKeyOnceHelper):
(WTF::ThreadIdentifierData::initializeKeyOnce):

• wtf/ThreadIdentifierDataPthreads.h:
• wtf/ThreadingPthreads.cpp:

(WTF::initializeThreading):

File:

• trunk/Source/JavaScriptCore/wtf/ThreadIdentifierDataPthreads.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/wtf/ThreadIdentifierDataPthreads.cpp

@@ -37 +37 @@
 #include "Threading.h"
 
-#include <limits.h>
-
 namespace WTF {
 
-pthread_key_t ThreadIdentifierData::m_key = PTHREAD_KEYS_MAX;
+pthread_key_t ThreadIdentifierData::m_key;
+static pthread_once_t onceControl = PTHREAD_ONCE_INIT;
 
 void clearPthreadHandleForIdentifier(ThreadIdentifier);
@@ -50 +49 @@
 }
 
-void ThreadIdentifierData::initializeOnce()
-{
-    if (pthread_key_create(&m_key, destruct))
-        CRASH();
-}
-
 ThreadIdentifier ThreadIdentifierData::identifier()
 {
-    ASSERT(m_key != PTHREAD_KEYS_MAX);
+    initializeKeyOnce();
     ThreadIdentifierData* threadIdentifierData = static_cast<ThreadIdentifierData*>(pthread_getspecific(m_key));
 
@@ -67 +60 @@
 {
     ASSERT(!identifier());
+
+    initializeKeyOnce();
     pthread_setspecific(m_key, new ThreadIdentifierData(id));
 }
@@ -85 +80 @@
 }
 
+void ThreadIdentifierData::initializeKeyOnceHelper()
+{
+    if (pthread_key_create(&m_key, destruct))
+        CRASH();
+}
+
+void ThreadIdentifierData::initializeKeyOnce()
+{
+    if (pthread_once(&onceControl, initializeKeyOnceHelper))
+        CRASH();
+}
+
 } // namespace WTF