Changeset 35442 in webkit for trunk/JavaScriptCore/API/APICast.h

Timestamp:

Jul 29, 2008, 11:05:11 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff Garen.

Implement JSContextGroup APIs to make concurrent execution possible for
JavaScriptCore clients.

This changes the behavior of JSGlobalContextCreate(), so that it now uses a private context
group for each context, making JSlock implicit locking unnecessary.

• API/JSContextRef.h:
• API/JSContextRef.cpp: (JSContextGroupCreate): (JSContextGroupRetain): (JSContextGroupRelease): (JSGlobalContextCreate): (JSGlobalContextCreateInGroup): (JSGlobalContextRelease): (JSContextGetGroup): Added new methods. JSGlobalContextCreate() calls JSGlobalContextCreateInGroup() now.

• API/APICast.h: (toJS): (toRef): Added converters for JSContextGroupRef.
• API/JSBase.cpp: (JSGarbageCollect): JSGarbageCollect(0) is now a no-op, and the passed in context is actually used.

• API/JSBase.h: Aded a typedef for JSContextGroupRef. Updated documentation for JSGarbageCollect().

• JavaScriptCore.exp: Removed JSGlobalData::sharedInstance().

• kjs/JSGlobalData.cpp:
• kjs/JSGlobalData.h: Removed support for JSGlobalData shared instance. JSGlobalData::isSharedInstance member variable still remains, to be deleted in a followup patch.

• kjs/JSLock.cpp: (KJS::JSLock::JSLock): Disabled JSLock, to be deleted in a follow-up patch.

• kjs/collector.cpp: (KJS::Heap::markOtherThreadConservatively): Removed an assertion that referenced JSGlobalData::sharedInstance.

• kjs/collector.h: Made Heap destructor public, so that JSContextRelease can use it.

JavaScriptGlue:

• JSRun.cpp: (JSRun::JSRun):
• JSUtils.cpp: (getThreadGlobalExecState): Changed JavaScriptGlue to use a JSGlobalData of its own, now that there is no shared instance.

File:

• trunk/JavaScriptCore/API/APICast.h (modified) (3 diffs)

trunk/JavaScriptCore/API/APICast.h

@@ -38 +38 @@
 }
 
+typedef const struct OpaqueJSContextGroup* JSContextGroupRef;
 typedef const struct OpaqueJSContext* JSContextRef;
 typedef struct OpaqueJSContext* JSGlobalContextRef;
@@ -75 +76 @@
 {
     return reinterpret_cast<KJS::PropertyNameArray*>(a);
+}
+
+inline KJS::JSGlobalData* toJS(JSContextGroupRef g)
+{
+    return reinterpret_cast<KJS::JSGlobalData*>(const_cast<OpaqueJSContextGroup*>(g));
 }
 
@@ -117 +123 @@
 }
 
+inline JSContextGroupRef toRef(KJS::JSGlobalData* g)
+{
+    return reinterpret_cast<JSContextGroupRef>(g);
+}
+
 #endif // APICast_h