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

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.h (modified) (6 diffs)

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -43 +43 @@
     class FunctionObjectImp;
     class FunctionPrototype;
+    struct HashTable;
     class JSGlobalObject;
     class NativeErrorImp;
@@ -68 +69 @@
     class UriErrorPrototype;
     struct ActivationStackNode;
+    struct ThreadClassInfoHashTables;
 
     typedef Vector<ExecState*, 16> ExecStateStack;
@@ -76 +78 @@
 
         struct JSGlobalObjectData : public JSVariableObjectData {
-            JSGlobalObjectData(JSGlobalObject* globalObject, JSObject* thisValue)
+            JSGlobalObjectData()
                 : JSVariableObjectData(&inlineSymbolTable)
-                , globalExec(globalObject, thisValue)
             {
             }
@@ -87 +88 @@
             Debugger* debugger;
             
-            GlobalExecState globalExec;
+            OwnPtr<GlobalExecState> globalExec;
             int recursion;
 
@@ -141 +142 @@
 
             OwnPtr<HashSet<JSObject*> > arrayVisitedElements; // Global data shared by array prototype functions.
+
+            PerThreadData perThreadData;
         };
 
     public:
         JSGlobalObject()
-            : JSVariableObject(new JSGlobalObjectData(this, this))
+            : JSVariableObject(new JSGlobalObjectData)
         {
-            init();
+            init(this);
         }
 
     protected:
         JSGlobalObject(JSValue* proto, JSObject* globalThisValue)
-            : JSVariableObject(proto, new JSGlobalObjectData(this, globalThisValue))
+            : JSVariableObject(proto, new JSGlobalObjectData)
         {
-            init();
+            init(globalThisValue);
         }
 
@@ -247 +250 @@
         HashSet<JSObject*>& arrayVisitedElements() { if (!d()->arrayVisitedElements) d()->arrayVisitedElements.set(new HashSet<JSObject*>); return *d()->arrayVisitedElements; }
 
+        // Per-thread hash tables, cached on the global object for faster access.
+        const PerThreadData* perThreadData() const { return &d()->perThreadData; }
+
+        // Initialize and/or retrieve per-thread hash tables - use perThreadData() for faster access instead.
+        static ThreadClassInfoHashTables* threadClassInfoHashTables();
+
     private:
-        void init();
+        void init(JSObject* thisValue);
         
         JSGlobalObjectData* d() const { return static_cast<JSGlobalObjectData*>(JSVariableObject::d); }