Changeset 32652 in webkit for trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

Timestamp:

Apr 28, 2008, 11:22:14 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Fix run-webkit-tests --threading
and provisionally fix <​https://bugs.webkit.org/show_bug.cgi?id=18661>
Proxy server issue in Sunday's Nightly

Changed ClassInfo objects for built-in objects to hold a getter function returning
a per-thread instance. This makes it safe to share these ClassInfo objects between threads -
and these are the only ones that need to be shared.

File:

• trunk/JavaScriptCore/kjs/JSGlobalObject.cpp (modified) (8 diffs)

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -45 +45 @@
 #include "string_object.h"
 
+#if USE(MULTIPLE_THREADS)
+#include <wtf/ThreadSpecific.h>
+using namespace WTF;
+#endif
+
 #if HAVE(SYS_TIME_H)
 #include <sys/time.h>
@@ -58 +63 @@
 
 namespace KJS {
+
+extern HashTable arrayTable;
+extern HashTable dateTable;
+extern HashTable mathTable;
+extern HashTable numberTable;
+extern HashTable RegExpImpTable;
+extern HashTable RegExpObjectImpTable;
+extern HashTable stringTable;
 
 // Default number of ticks before a timeout check should be done.
@@ -119 +132 @@
 }
 
-void JSGlobalObject::init()
+struct ThreadClassInfoHashTables {
+    ThreadClassInfoHashTables()
+        : arrayTable(KJS::arrayTable)
+        , dateTable(KJS::dateTable)
+        , mathTable(KJS::mathTable)
+        , numberTable(KJS::numberTable)
+        , RegExpImpTable(KJS::RegExpImpTable)
+        , RegExpObjectImpTable(KJS::RegExpObjectImpTable)
+        , stringTable(KJS::stringTable)
+    {
+    }
+
+    ~ThreadClassInfoHashTables()
+    {
+#if USE(MULTIPLE_THREADS)
+        delete[] arrayTable.table;
+        delete[] dateTable.table;
+        delete[] mathTable.table;
+        delete[] numberTable.table;
+        delete[] RegExpImpTable.table;
+        delete[] RegExpObjectImpTable.table;
+        delete[] stringTable.table;
+#endif
+    }
+
+#if USE(MULTIPLE_THREADS)
+    HashTable arrayTable;
+    HashTable dateTable;
+    HashTable mathTable;
+    HashTable numberTable;
+    HashTable RegExpImpTable;
+    HashTable RegExpObjectImpTable;
+    HashTable stringTable;
+#else
+    HashTable& arrayTable;
+    HashTable& dateTable;
+    HashTable& mathTable;
+    HashTable& numberTable;
+    HashTable& RegExpImpTable;
+    HashTable& RegExpObjectImpTable;
+    HashTable& stringTable;
+#endif
+};
+
+ThreadClassInfoHashTables* JSGlobalObject::threadClassInfoHashTables()
+{
+#if USE(MULTIPLE_THREADS)
+    static ThreadSpecific<ThreadClassInfoHashTables> sharedInstance;
+    return sharedInstance;
+#else
+    static ThreadClassInfoHashTables sharedInstance;
+    return &sharedInstance;
+#endif
+}
+
+void JSGlobalObject::init(JSObject* thisValue)
 {
     ASSERT(JSLock::currentThreadIsHoldingLock());
@@ -142 +210 @@
     d()->activations = newStackNode;
     d()->activationCount = 0;
+
+    d()->perThreadData.arrayTable = &threadClassInfoHashTables()->arrayTable;
+    d()->perThreadData.dateTable = &threadClassInfoHashTables()->dateTable;
+    d()->perThreadData.mathTable = &threadClassInfoHashTables()->mathTable;
+    d()->perThreadData.numberTable = &threadClassInfoHashTables()->numberTable;
+    d()->perThreadData.RegExpImpTable = &threadClassInfoHashTables()->RegExpImpTable;
+    d()->perThreadData.RegExpObjectImpTable = &threadClassInfoHashTables()->RegExpObjectImpTable;
+    d()->perThreadData.stringTable = &threadClassInfoHashTables()->stringTable;
+    d()->perThreadData.propertyNames = CommonIdentifiers::shared();
+
+    d()->globalExec.set(new GlobalExecState(this, thisValue));
 
     d()->pageGroupIdentifier = 0;
@@ -232 +311 @@
     d()->evalFunction = 0;
 
-    ExecState* exec = &d()->globalExec;
+    ExecState* exec = d()->globalExec.get();
 
     // Prototypes
@@ -419 +498 @@
         (*it)->m_scopeChain.mark();
 
-    markIfNeeded(d()->globalExec.exception());
+    markIfNeeded(d()->globalExec->exception());
 
     markIfNeeded(d()->objectConstructor);
@@ -463 +542 @@
 ExecState* JSGlobalObject::globalExec()
 {
-    return &d()->globalExec;
+    return d()->globalExec.get();
 }
 
@@ -493 +572 @@
 }
 
+
 } // namespace KJS