Changeset 35442 in webkit for trunk/JavaScriptCore/API/JSContextRef.cpp

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/JSContextRef.cpp (modified) (4 diffs)

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -38 +38 @@
 using namespace KJS;
 
+JSContextGroupRef JSContextGroupCreate()
+{
+    return toRef(JSGlobalData::create().releaseRef());
+}
+
+JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group)
+{
+    toJS(group)->ref();
+    return group;
+}
+
+void JSContextGroupRelease(JSContextGroupRef group)
+{
+    toJS(group)->deref();
+}
+
 JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
+{
+    return JSGlobalContextCreateInGroup(toRef(JSGlobalData::create().get()), globalObjectClass);
+}
+
+JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass)
 {
     initializeThreading();
@@ -44 +65 @@
     JSLock lock(true);
 
-    JSGlobalData* sharedGlobalData = &JSGlobalData::sharedInstance();
+    JSGlobalData* globalData = toJS(group);
 
     if (!globalObjectClass) {
-        JSGlobalObject* globalObject = new (sharedGlobalData) JSGlobalObject;
+        JSGlobalObject* globalObject = new (globalData) JSGlobalObject;
         return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec()));
     }
 
-    JSGlobalObject* globalObject = new (sharedGlobalData) JSCallbackObject<JSGlobalObject>(globalObjectClass);
+    JSGlobalObject* globalObject = new (globalData) JSCallbackObject<JSGlobalObject>(globalObjectClass);
     ExecState* exec = globalObject->globalExec();
     JSValue* prototype = globalObjectClass->prototype(exec);
@@ -76 +97 @@
 
     gcUnprotect(exec->dynamicGlobalObject());
+
+    JSGlobalData& globalData = exec->globalData();
+    if (globalData.refCount() == 1) {
+        // The last reference was released, this is our last chance to collect.
+        Heap* heap = globalData.heap;
+
+        ASSERT(!heap->protectedObjectCount());
+        ASSERT(!heap->isBusy());
+
+        // Heap::destroy() will delete JSGlobalObject, which will in turn delete JSGlobalData, which will
+        // delete the heap, which would cause a crash if allowed.
+        globalData.heap = 0;
+
+        delete heap;
+    }
 }
 
@@ -86 +122 @@
     return toRef(exec->dynamicGlobalObject()->toThisObject(exec));
 }
+
+JSContextGroupRef JSContextGetGroup(JSContextRef ctx)
+{
+    ExecState* exec = toJS(ctx);
+    return toRef(&exec->globalData());
+}