Changeset 32807 in webkit for trunk/JavaScriptCore/kjs/testkjs.cpp

Timestamp:

May 2, 2008, 3:07:53 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoffrey Garen.

​https://bugs.webkit.org/show_bug.cgi?id=18826
Make JavaScript heap per-thread

File:

• trunk/JavaScriptCore/kjs/testkjs.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -132 +132 @@
 GlobalObject::GlobalObject(Vector<UString>& arguments)
 {
-    putDirectFunction(new PrototypeFunction(globalExec(), functionPrototype(), 1, "debug", functionDebug));
-    putDirectFunction(new PrototypeFunction(globalExec(), functionPrototype(), 1, "print", functionPrint));
-    putDirectFunction(new PrototypeFunction(globalExec(), functionPrototype(), 0, "quit", functionQuit));
-    putDirectFunction(new PrototypeFunction(globalExec(), functionPrototype(), 0, "gc", functionGC));
-    putDirectFunction(new PrototypeFunction(globalExec(), functionPrototype(), 1, "version", functionVersion));
-    putDirectFunction(new PrototypeFunction(globalExec(), functionPrototype(), 1, "run", functionRun));
-    putDirectFunction(new PrototypeFunction(globalExec(), functionPrototype(), 1, "load", functionLoad));
-    putDirectFunction(new PrototypeFunction(globalExec(), functionPrototype(), 0, "readline", functionReadline));
+    putDirectFunction(new (globalExec()) PrototypeFunction(globalExec(), functionPrototype(), 1, "debug", functionDebug));
+    putDirectFunction(new (globalExec()) PrototypeFunction(globalExec(), functionPrototype(), 1, "print", functionPrint));
+    putDirectFunction(new (globalExec()) PrototypeFunction(globalExec(), functionPrototype(), 0, "quit", functionQuit));
+    putDirectFunction(new (globalExec()) PrototypeFunction(globalExec(), functionPrototype(), 0, "gc", functionGC));
+    putDirectFunction(new (globalExec()) PrototypeFunction(globalExec(), functionPrototype(), 1, "version", functionVersion));
+    putDirectFunction(new (globalExec()) PrototypeFunction(globalExec(), functionPrototype(), 1, "run", functionRun));
+    putDirectFunction(new (globalExec()) PrototypeFunction(globalExec(), functionPrototype(), 1, "load", functionLoad));
+    putDirectFunction(new (globalExec()) PrototypeFunction(globalExec(), functionPrototype(), 0, "readline", functionReadline));
 
     JSObject* array = arrayConstructor()->construct(globalExec(), globalExec()->emptyList());
     for (size_t i = 0; i < arguments.size(); ++i)
-        array->put(globalExec(), i, jsString(arguments[i]));
+        array->put(globalExec(), i, jsString(globalExec(), arguments[i]));
     putDirect("arguments", array);
 
@@ -162 +162 @@
 }
 
-JSValue* functionGC(ExecState*, JSObject*, const List&)
+JSValue* functionGC(ExecState* exec, JSObject*, const List&)
 {
     JSLock lock;
-    Collector::collect();
+    exec->heap()->collect();
     return jsUndefined();
 }
@@ -188 +188 @@
     stopWatch.stop();
 
-    return jsNumber(stopWatch.getElapsedMS());
+    return jsNumber(exec, stopWatch.getElapsedMS());
 }
 
@@ -203 +203 @@
 }
 
-JSValue* functionReadline(ExecState*, JSObject*, const List&)
+JSValue* functionReadline(ExecState* exec, JSObject*, const List&)
 {
     Vector<char, 256> line;
@@ -214 +214 @@
     }
     line.append('\0');
-    return jsString(line.data());
+    return jsString(exec, line.data());
 }
 
@@ -346 +346 @@
 
 #ifndef NDEBUG
-    Collector::collect();
+    Heap::threadHeap()->collect();
 #endif