Changeset 32652 in webkit for trunk/JavaScriptCore/kjs/object.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/object.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/object.h

@@ -66 +66 @@
     /**
      * Static hash-table of properties.
-     */
-    const HashTable* propHashTable;
+     * For classes that can be used from multiple threads, it is accessed via a getter function that would typically return a pointer to thread-specific value.
+     */
+    const HashTable* propHashTable(ExecState* exec) const
+    {
+        if (classPropHashTableGetterFunction)
+            return classPropHashTableGetterFunction(exec);
+        return staticPropHashTable;
+    }
+
+    const HashTable* staticPropHashTable;
+    typedef const HashTable* (*ClassPropHashTableGetterFunction)(ExecState*);
+    const ClassPropHashTableGetterFunction classPropHashTableGetterFunction;
   };
   
@@ -146 +156 @@
      *
      * \code
-     *   const ClassInfo BarImp::info = { "Bar", 0, 0 }; // no parent class
-     *   const ClassInfo FooImp::info = { "Foo", &BarImp::info, 0 };
+     *   const ClassInfo BarImp::info = { "Bar", 0, 0, 0 }; // no parent class
+     *   const ClassInfo FooImp::info = { "Foo", &BarImp::info, 0, 0 };
      * \endcode
      *
@@ -410 +420 @@
     virtual JSGlobalObject* toGlobalObject(ExecState*) const;
 
-    virtual bool getPropertyAttributes(const Identifier& propertyName, unsigned& attributes) const;
+    virtual bool getPropertyAttributes(ExecState*, const Identifier& propertyName, unsigned& attributes) const;
     
     // WebCore uses this to make document.all and style.filter undetectable
@@ -444 +454 @@
 
   private:
-    const HashEntry* findPropertyHashEntry( const Identifier& propertyName ) const;
+    const HashEntry* findPropertyHashEntry(ExecState*, const Identifier& propertyName) const;
     JSValue *_proto;
   };