Changeset 38622 in webkit for trunk/JavaScriptCore/runtime/Collector.cpp

Timestamp:

Nov 20, 2008, 10:11:14 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=22364
Crashes seen on Tiger buildbots due to worker threads exhausting pthread keys

• runtime/Collector.cpp: (JSC::Heap::Heap): (JSC::Heap::destroy): (JSC::Heap::makeUsableFromMultipleThreads): (JSC::Heap::registerThread):
• runtime/Collector.h: Pthread key for tracking threads is only created on request now, because this is a limited resource, and thread tracking is not needed for worker heaps, or for WebCore heap.

• API/JSContextRef.cpp: (JSGlobalContextCreateInGroup): Call makeUsableFromMultipleThreads().

• runtime/JSGlobalData.cpp: (JSC::JSGlobalData::sharedInstance): Ditto.

• runtime/JSGlobalData.h: (JSC::JSGlobalData::makeUsableFromMultipleThreads): Just forward the call to Heap, which clients need not know about, ideally.

File:

• trunk/JavaScriptCore/runtime/Collector.cpp (modified) (3 diffs)

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -122 +122 @@
 #if ENABLE(JSC_MULTIPLE_THREADS)
     , m_registeredThreads(0)
+    , m_currentThreadRegistrar(0)
 #endif
     , m_globalData(globalData)
 {
     ASSERT(globalData);
-
-#if ENABLE(JSC_MULTIPLE_THREADS)
-    int error = pthread_key_create(&m_currentThreadRegistrar, unregisterThread);
-    if (error)
-        CRASH();
-#endif
 
     memset(&primaryHeap, 0, sizeof(CollectorHeap));
@@ -166 +161 @@
 
 #if ENABLE(JSC_MULTIPLE_THREADS)
+    if (m_currentThreadRegistrar) {
 #ifndef NDEBUG
-    int error =
-#endif
-        pthread_key_delete(m_currentThreadRegistrar);
-    ASSERT(!error);
+        int error =
+#endif
+            pthread_key_delete(m_currentThreadRegistrar);
+        ASSERT(!error);
+    }
 
     MutexLocker registeredThreadsLock(m_registeredThreadsMutex);
@@ -479 +476 @@
 }
 
+void Heap::makeUsableFromMultipleThreads()
+{
+    if (m_currentThreadRegistrar)
+        return;
+
+    int error = pthread_key_create(&m_currentThreadRegistrar, unregisterThread);
+    if (error)
+        CRASH();
+}
+
 void Heap::registerThread()
 {
-    if (pthread_getspecific(m_currentThreadRegistrar))
+    if (!m_currentThreadRegistrar || pthread_getspecific(m_currentThreadRegistrar))
         return;