JavaScriptCore-621.1.tar.gz

[apple/javascriptcore.git] / API / JSBase.cpp

diff --git a/API/JSBase.cpp b/API/JSBase.cpp
index fc3d0fe1bcbe8707232390a9f23cc1cfc67a2b7a..c5f1b15ea90c1088852425e65ca7b35c86da086a 100644 (file)
--- a/API/JSBase.cpp
+++ b/API/JSBase.cpp
@@ -28,6 +28,7 @@
 #include "JSBasePrivate.h"
 
 #include "APICast.h"
 #include "JSBasePrivate.h"
 
 #include "APICast.h"

+#include "APIShims.h"

 #include "Completion.h"
 #include "OpaqueJSString.h"
 #include "SourceCode.h"
 #include "Completion.h"
 #include "OpaqueJSString.h"
 #include "SourceCode.h"


@@ -37,14 +38,14 @@
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSLock.h>
 #include <runtime/JSObject.h>
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSLock.h>
 #include <runtime/JSObject.h>

+#include <wtf/text/StringHash.h>

 
 using namespace JSC;
 
 JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef thisObject, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 
 using namespace JSC;
 
 JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef thisObject, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
     JSObject* jsThisObject = toJS(thisObject);
 
 
     JSObject* jsThisObject = toJS(thisObject);
 


@@ -69,8 +70,7 @@ JSValueRef JSEvaluateScript(JSContextRef ctx, JSStringRef script, JSObjectRef th
 bool JSCheckScriptSyntax(JSContextRef ctx, JSStringRef script, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);
 bool JSCheckScriptSyntax(JSContextRef ctx, JSStringRef script, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

 
     SourceCode source = makeSource(script->ustring(), sourceURL->ustring(), startingLineNumber);
     Completion completion = checkSyntax(exec->dynamicGlobalObject()->globalExec(), source);
 
     SourceCode source = makeSource(script->ustring(), sourceURL->ustring(), startingLineNumber);
     Completion completion = checkSyntax(exec->dynamicGlobalObject()->globalExec(), source);


@@ -94,12 +94,11 @@ void JSGarbageCollect(JSContextRef ctx)
         return;
 
     ExecState* exec = toJS(ctx);
         return;
 
     ExecState* exec = toJS(ctx);

-    JSGlobalData& globalData = exec->globalData();
-
-    JSLock lock(globalData.isSharedInstance);
+    APIEntryShim entryShim(exec, false);

 
 

+    JSGlobalData& globalData = exec->globalData();

     if (!globalData.heap.isBusy())
     if (!globalData.heap.isBusy())

-        globalData.heap.collect();
+        globalData.heap.collectAllGarbage();

 
     // FIXME: Perhaps we should trigger a second mark and sweep
     // once the garbage collector is done if this is called when
 
     // FIXME: Perhaps we should trigger a second mark and sweep
     // once the garbage collector is done if this is called when


@@ -109,8 +108,6 @@ void JSGarbageCollect(JSContextRef ctx)
 void JSReportExtraMemoryCost(JSContextRef ctx, size_t size)
 {
     ExecState* exec = toJS(ctx);
 void JSReportExtraMemoryCost(JSContextRef ctx, size_t size)
 {
     ExecState* exec = toJS(ctx);

-    exec->globalData().heap.registerThread();
-    JSLock lock(exec);
-
+    APIEntryShim entryShim(exec);

     exec->globalData().heap.reportExtraMemoryCost(size);
 }
     exec->globalData().heap.reportExtraMemoryCost(size);
 }