Changeset 34659 in webkit for trunk/JavaScriptCore/API

Timestamp:

Jun 19, 2008, 10:29:29 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Prepare JavaScript heap for being per-thread.

Location:

trunk/JavaScriptCore/API

Files:

• JSBase.cpp (modified) (2 diffs)
• JSCallbackObjectFunctions.h (modified) (1 diff)
• JSClassRef.cpp (modified) (1 diff)
• JSContextRef.cpp (modified) (1 diff)
• JSObjectRef.cpp (modified) (5 diffs)
• JSValueRef.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSBase.cpp

@@ -29 +29 @@
 
 #include "APICast.h"
+#include "completion.h"
 #include <kjs/ExecState.h>
 #include <kjs/InitializeThreading.h>
@@ -86 +87 @@
         initializeThreading();
 
+    // It might seem that we have a context passed to this function, and can use toJS(ctx)->heap(), but the parameter is likely to be NULL,
+    // and it may actually be garbage for some clients (most likely, because of JSGarbageCollect being called after releasing the context).
+
     JSLock lock;
-    if (!Collector::isBusy())
-        Collector::collect();
+
+    // FIXME: It would be good to avoid creating a JSGlobalData instance if it didn't exist for this thread yet.
+    Heap* heap = JSGlobalData::threadInstance().heap;
+    if (!heap->isBusy())
+        heap->collect();
+
+    // FIXME: Similarly, we shouldn't create a shared instance here.
+    heap = JSGlobalData::sharedInstance().heap;
+    if (!heap->isBusy())
+        heap->collect();
+
     // FIXME: Perhaps we should trigger a second mark and sweep
     // once the garbage collector is done if this is called when

trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -471 +471 @@
             if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
                 if (JSObjectCallAsFunctionCallback callAsFunction = entry->callAsFunction) {
-                    JSObject* o = new JSCallbackFunction(exec, callAsFunction, propertyName);
+                    JSObject* o = new (exec) JSCallbackFunction(exec, callAsFunction, propertyName);
                     thisObj->putDirect(propertyName, o, entry->attributes);
                     return o;

trunk/JavaScriptCore/API/JSClassRef.cpp

@@ -163 +163 @@
         if (!parentPrototype)
             parentPrototype = exec->dynamicGlobalObject()->objectPrototype();
-        cachedPrototype = new JSCallbackObject<JSObject>(exec, prototypeClass, parentPrototype, this); // set ourself as the object's private data, so it can clear our reference on destruction
+        cachedPrototype = new (exec) JSCallbackObject<JSObject>(exec, prototypeClass, parentPrototype, this); // set ourself as the object's private data, so it can clear our reference on destruction
     }
     return cachedPrototype;

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -45 +45 @@
 
     if (!globalObjectClass) {
-        JSGlobalObject* globalObject = new JSGlobalObject;
+        JSGlobalObject* globalObject = new (JSGlobalObject::Shared) JSGlobalObject;
         return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec()));
     }
 
-    JSGlobalObject* globalObject = new JSCallbackObject<JSGlobalObject>(globalObjectClass);
+    JSGlobalObject* globalObject = new (JSGlobalObject::Shared) JSCallbackObject<JSGlobalObject>(globalObjectClass);
     JSGlobalContextRef ctx = toGlobalRef(globalObject->globalExec());
     JSValue* prototype = globalObjectClass->prototype(ctx);

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -75 +75 @@
 
     if (!jsClass)
-        return toRef(new JSObject(exec->lexicalGlobalObject()->objectPrototype())); // slightly more efficient
+        return toRef(new (exec) JSObject(exec->lexicalGlobalObject()->objectPrototype())); // slightly more efficient
 
     JSValue* jsPrototype = jsClass->prototype(ctx);
@@ -81 +81 @@
         jsPrototype = exec->lexicalGlobalObject()->objectPrototype();
 
-    return toRef(new JSCallbackObject<JSObject>(exec, jsClass, jsPrototype, data));
+    return toRef(new (exec) JSCallbackObject<JSObject>(exec, jsClass, jsPrototype, data));
 }
 
@@ -90 +90 @@
     Identifier nameID = name ? Identifier(exec, toJS(name)) : Identifier(exec, "anonymous");
     
-    return toRef(new JSCallbackFunction(exec, callAsFunction, nameID));
+    return toRef(new (exec) JSCallbackFunction(exec, callAsFunction, nameID));
 }
 
@@ -102 +102 @@
         : exec->dynamicGlobalObject()->objectPrototype();
     
-    JSCallbackConstructor* constructor = new JSCallbackConstructor(exec, jsClass, callAsConstructor);
+    JSCallbackConstructor* constructor = new (exec) JSCallbackConstructor(exec, jsClass, callAsConstructor);
     constructor->putDirect(exec->propertyNames().prototype, jsPrototype, DontEnum | DontDelete | ReadOnly);
     return toRef(constructor);
@@ -119 +119 @@
     ArgList args;
     for (unsigned i = 0; i < parameterCount; i++)
-        args.append(jsString(UString(toJS(parameterNames[i]))));
-    args.append(jsString(UString(bodyRep)));
+        args.append(jsString(exec, UString(toJS(parameterNames[i]))));
+    args.append(jsString(exec, UString(bodyRep)));
 
     JSObject* result = exec->dynamicGlobalObject()->functionConstructor()->construct(exec, args, nameID, UString(sourceURLRep), startingLineNumber);

trunk/JavaScriptCore/API/JSValueRef.cpp

@@ -177 +177 @@
 }
 
-JSValueRef JSValueMakeNumber(JSContextRef, double value)
-{
-    JSLock lock;
-    return toRef(jsNumber(value));
-}
-
-JSValueRef JSValueMakeString(JSContextRef, JSStringRef string)
+JSValueRef JSValueMakeNumber(JSContextRef ctx, double value)
+{
+    JSLock lock;
+    return toRef(jsNumber(toJS(ctx), value));
+}
+
+JSValueRef JSValueMakeString(JSContextRef ctx, JSStringRef string)
 {
     JSLock lock;
     UString::Rep* rep = toJS(string);
-    return toRef(jsString(UString(rep)));
+    return toRef(jsString(toJS(ctx), UString(rep)));
 }