Changeset 35442 in webkit for trunk/JavaScriptCore/API/JSBase.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/JSBase.h (modified) (2 diffs)

trunk/JavaScriptCore/API/JSBase.h

@@ -32 +32 @@
 
 /* JavaScript engine interface */
+
+/*! @typedef JSContextGroupRef A group that associates JavaScript contexts with one another. Contexts in the same group may share and exchange JavaScript objects. */
+typedef const struct OpaqueJSContextGroup* JSContextGroupRef;
 
 /*! @typedef JSContextRef A JavaScript execution context. Holds the global object and other execution state. */
@@ -109 +112 @@
 @function
 @abstract Performs a JavaScript garbage collection. 
-@param ctx This parameter is currently unused. Pass NULL.
+@param ctx The execution context to use.
 @discussion JavaScript values that are on the machine stack, in a register, 
  protected by JSValueProtect, set as the global object of an execution context, 
- or reachable from any such value will not be collected. 
- 
+ or reachable from any such value will not be collected.
+
  During JavaScript execution, you are not required to call this function; the 
- JavaScript engine will garbage collect as needed. One place you may want to call 
- this function, however, is after releasing the last reference to a JSGlobalContextRef. 
- At that point, a garbage collection can free the objects still referenced by the 
- JSGlobalContextRef's global object, along with the global object itself.
+ JavaScript engine will garbage collect as needed. JavaScript values created
+ within a context group are automatically destroyed when the last reference
+ to the context group is released.
 */
 JS_EXPORT void JSGarbageCollect(JSContextRef ctx);