Changeset 48315 in webkit for trunk/JavaScriptCore

Timestamp:

Sep 11, 2009, 2:34:55 PM (16 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff Garen.

​https://bugs.webkit.org/show_bug.cgi?id=29207
Add checks for using WebCore JS context on secondary threads

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Collector.cpp (modified) (1 diff)
• runtime/JSGlobalData.cpp (modified) (1 diff)
• runtime/JSGlobalData.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-09-11  Alexey Proskuryakov  <[email protected]>
+
+        Reviewed by Geoff Garen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29207
+        Add checks for using WebCore JS context on secondary threads
+
+        * runtime/JSGlobalData.cpp: (JSC::JSGlobalData::JSGlobalData):
+        * runtime/JSGlobalData.h:
+        Added a new mainThreadOnly flag that WebCore would set.
+
+        * runtime/Collector.cpp: (JSC::Heap::registerThread): JSC API methods always call this,
+        so this is a good place to check that the API isn't used form a wrong thread.
+
 2009-09-11  Jocelyn Turcotte  <[email protected]>
 

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -652 +652 @@
 void Heap::registerThread()
 {
+    ASSERT(!m_globalData->mainThreadOnly || isMainThread());
+
     if (!m_currentThreadRegistrar || pthread_getspecific(m_currentThreadRegistrar))
         return;

trunk/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -148 +148 @@
     , firstStringifierToMark(0)
     , markStack(vptrSet.jsArrayVPtr)
+#ifndef NDEBUG
+    , mainThreadOnly(false)
+#endif
 {
 #if PLATFORM(MAC)

trunk/JavaScriptCore/runtime/JSGlobalData.h

@@ -151 +151 @@
 
         MarkStack markStack;
+
+#ifndef NDEBUG
+        bool mainThreadOnly;
+#endif
+
     private:
         JSGlobalData(bool isShared, const VPtrSet&);