JavaScriptCore-1097.3.tar.gz

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

diff --git a/API/JSContextRef.cpp b/API/JSContextRef.cpp
index c331179ec71070d533c63bf79e600b28a4f1bfc9..7a57287ded4e02d4b0dcc4997dda90431b6da1ab 100644 (file)
--- a/API/JSContextRef.cpp
+++ b/API/JSContextRef.cpp
@@ -25,16 +25,20 @@
 
 #include "config.h"
 #include "JSContextRef.h"
 
 #include "config.h"
 #include "JSContextRef.h"

+#include "JSContextRefPrivate.h"

 
 #include "APICast.h"
 #include "InitializeThreading.h"
 
 #include "APICast.h"
 #include "InitializeThreading.h"

+#include <interpreter/CallFrame.h>
+#include <interpreter/Interpreter.h>

 #include "JSCallbackObject.h"
 #include "JSClassRef.h"
 #include "JSGlobalObject.h"
 #include "JSObject.h"
 #include "JSCallbackObject.h"
 #include "JSClassRef.h"
 #include "JSGlobalObject.h"
 #include "JSObject.h"

-#include <wtf/Platform.h>
+#include "UStringBuilder.h"
+#include <wtf/text/StringHash.h>

 
 

-#if PLATFORM(DARWIN)
+#if OS(DARWIN)

 #include <mach-o/dyld.h>
 
 static const int32_t webkitFirstVersionWithConcurrentGlobalContexts = 0x2100500; // 528.5.0
 #include <mach-o/dyld.h>
 
 static const int32_t webkitFirstVersionWithConcurrentGlobalContexts = 0x2100500; // 528.5.0


@@ -42,10 +46,15 @@ static const int32_t webkitFirstVersionWithConcurrentGlobalContexts = 0x2100500;
 
 using namespace JSC;
 
 
 using namespace JSC;
 

+// From the API's perspective, a context group remains alive iff
+//     (a) it has been JSContextGroupRetained
+//     OR
+//     (b) one of its contexts has been JSContextRetained
+

 JSContextGroupRef JSContextGroupCreate()
 {
     initializeThreading();
 JSContextGroupRef JSContextGroupCreate()
 {
     initializeThreading();

-    return toRef(JSGlobalData::create().releaseRef());
+    return toRef(JSGlobalData::createContextGroup(ThreadStackTypeSmall).leakRef());

 }
 
 JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group)
 }
 
 JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group)


@@ -59,21 +68,19 @@ void JSContextGroupRelease(JSContextGroupRef group)
     toJS(group)->deref();
 }
 
     toJS(group)->deref();
 }
 

+// From the API's perspective, a global context remains alive iff it has been JSGlobalContextRetained.
+

 JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
 {
     initializeThreading();
 JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass)
 {
     initializeThreading();

-#if PLATFORM(DARWIN)
-    // When running on Tiger or Leopard, or if the application was linked before JSGlobalContextCreate was changed
-    // to use a unique JSGlobalData, we use a shared one for compatibility.
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+
+#if OS(DARWIN)
+    // If the application was linked before JSGlobalContextCreate was changed to use a unique JSGlobalData,
+    // we use a shared one for backwards compatibility.

     if (NSVersionOfLinkTimeLibrary("JavaScriptCore") <= webkitFirstVersionWithConcurrentGlobalContexts) {
     if (NSVersionOfLinkTimeLibrary("JavaScriptCore") <= webkitFirstVersionWithConcurrentGlobalContexts) {

-#else
-    {
-#endif
-        JSLock lock(true);

         return JSGlobalContextCreateInGroup(toRef(&JSGlobalData::sharedInstance()), globalObjectClass);
     }
         return JSGlobalContextCreateInGroup(toRef(&JSGlobalData::sharedInstance()), globalObjectClass);
     }

-#endif // PLATFORM(DARWIN)
+#endif // OS(DARWIN)

 
     return JSGlobalContextCreateInGroup(0, globalObjectClass);
 }
 
     return JSGlobalContextCreateInGroup(0, globalObjectClass);
 }


@@ -82,37 +89,31 @@ JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClass
 {
     initializeThreading();
 
 {
     initializeThreading();
 

-    JSLock lock(true);
-
-    RefPtr<JSGlobalData> globalData = group ? PassRefPtr<JSGlobalData>(toJS(group)) : JSGlobalData::create();
+    RefPtr<JSGlobalData> globalData = group ? PassRefPtr<JSGlobalData>(toJS(group)) : JSGlobalData::createContextGroup(ThreadStackTypeSmall);

 
 

-#if ENABLE(JSC_MULTIPLE_THREADS)
+    APIEntryShim entryShim(globalData.get(), false);

     globalData->makeUsableFromMultipleThreads();
     globalData->makeUsableFromMultipleThreads();

-#endif

 
     if (!globalObjectClass) {
 
     if (!globalObjectClass) {

-        JSGlobalObject* globalObject = new (globalData.get()) JSGlobalObject;
+        JSGlobalObject* globalObject = JSGlobalObject::create(*globalData, JSGlobalObject::createStructure(*globalData, jsNull()));

         return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec()));
     }
 
         return JSGlobalContextRetain(toGlobalRef(globalObject->globalExec()));
     }
 

-    JSGlobalObject* globalObject = new (globalData.get()) JSCallbackObject<JSGlobalObject>(globalObjectClass);
+    JSGlobalObject* globalObject = JSCallbackObject<JSGlobalObject>::create(*globalData, globalObjectClass, JSCallbackObject<JSGlobalObject>::createStructure(*globalData, 0, jsNull()));

     ExecState* exec = globalObject->globalExec();
     ExecState* exec = globalObject->globalExec();

-    JSValuePtr prototype = globalObjectClass->prototype(exec);
+    JSValue prototype = globalObjectClass->prototype(exec);

     if (!prototype)
         prototype = jsNull();
     if (!prototype)
         prototype = jsNull();

-    globalObject->resetPrototype(prototype);
+    globalObject->resetPrototype(*globalData, prototype);

     return JSGlobalContextRetain(toGlobalRef(exec));
 }
 
 JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef ctx)
 {
     ExecState* exec = toJS(ctx);
     return JSGlobalContextRetain(toGlobalRef(exec));
 }
 
 JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef ctx)
 {
     ExecState* exec = toJS(ctx);

-    JSLock lock(exec);
+    APIEntryShim entryShim(exec);

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

-
-    globalData.heap.registerThread();
-

     gcProtect(exec->dynamicGlobalObject());
     globalData.ref();
     return ctx;
     gcProtect(exec->dynamicGlobalObject());
     globalData.ref();
     return ctx;


@@ -120,31 +121,30 @@ JSGlobalContextRef JSGlobalContextRetain(JSGlobalContextRef ctx)
 
 void JSGlobalContextRelease(JSGlobalContextRef ctx)
 {
 
 void JSGlobalContextRelease(JSGlobalContextRef ctx)
 {

+    IdentifierTable* savedIdentifierTable;

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    JSLock lock(exec);
+    {
+        JSLockHolder lock(exec);

 
 

-    gcUnprotect(exec->dynamicGlobalObject());
+        JSGlobalData& globalData = exec->globalData();
+        savedIdentifierTable = wtfThreadData().setCurrentIdentifierTable(globalData.identifierTable);

 
 

-    JSGlobalData& globalData = exec->globalData();
-    if (globalData.refCount() == 2) { // One reference is held by JSGlobalObject, another added by JSGlobalContextRetain().
-        // The last reference was released, this is our last chance to collect.
-        ASSERT(!globalData.heap.protectedObjectCount());
-        ASSERT(!globalData.heap.isBusy());
-        globalData.heap.destroy();
-    } else
-        globalData.heap.collect();
-
-    globalData.deref();
+        bool protectCountIsZero = Heap::heap(exec->dynamicGlobalObject())->unprotect(exec->dynamicGlobalObject());
+        if (protectCountIsZero)
+            globalData.heap.reportAbandonedObjectGraph();
+        globalData.deref();
+    }
+
+    wtfThreadData().setCurrentIdentifierTable(savedIdentifierTable);

 }
 
 JSObjectRef JSContextGetGlobalObject(JSContextRef ctx)
 {
     ExecState* exec = toJS(ctx);
 }
 
 JSObjectRef JSContextGetGlobalObject(JSContextRef ctx)
 {
     ExecState* exec = toJS(ctx);

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

 
     // It is necessary to call toThisObject to get the wrapper object when used with WebCore.
 
     // It is necessary to call toThisObject to get the wrapper object when used with WebCore.

-    return toRef(exec->lexicalGlobalObject()->toThisObject(exec));
+    return toRef(exec->lexicalGlobalObject()->methodTable()->toThisObject(exec->lexicalGlobalObject(), exec));

 }
 
 JSContextGroupRef JSContextGetGroup(JSContextRef ctx)
 }
 
 JSContextGroupRef JSContextGetGroup(JSContextRef ctx)


@@ -152,3 +152,68 @@ JSContextGroupRef JSContextGetGroup(JSContextRef ctx)
     ExecState* exec = toJS(ctx);
     return toRef(&exec->globalData());
 }
     ExecState* exec = toJS(ctx);
     return toRef(&exec->globalData());
 }

+
+JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx)
+{
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    return toGlobalRef(exec->lexicalGlobalObject()->globalExec());
+}
+    
+JSStringRef JSContextCreateBacktrace(JSContextRef ctx, unsigned maxStackSize)
+{
+    ExecState* exec = toJS(ctx);
+    JSLockHolder lock(exec);
+
+    unsigned count = 0;
+    UStringBuilder builder;
+    CallFrame* callFrame = exec;
+    UString functionName;
+    if (exec->callee()) {
+        if (asObject(exec->callee())->inherits(&InternalFunction::s_info)) {
+            functionName = asInternalFunction(exec->callee())->name(exec);
+            builder.append("#0 ");
+            builder.append(functionName);
+            builder.append("() ");
+            count++;
+        }
+    }
+    while (true) {
+        ASSERT(callFrame);
+        int signedLineNumber;
+        intptr_t sourceID;
+        UString urlString;
+        JSValue function;
+        
+        UString levelStr = UString::number(count);
+        
+        exec->interpreter()->retrieveLastCaller(callFrame, signedLineNumber, sourceID, urlString, function);
+
+        if (function)
+            functionName = jsCast<JSFunction*>(function)->name(exec);
+        else {
+            // Caller is unknown, but if frame is empty we should still add the frame, because
+            // something called us, and gave us arguments.
+            if (count)
+                break;
+        }
+        unsigned lineNumber = signedLineNumber >= 0 ? signedLineNumber : 0;
+        if (!builder.isEmpty())
+            builder.append("\n");
+        builder.append("#");
+        builder.append(levelStr);
+        builder.append(" ");
+        builder.append(functionName);
+        builder.append("() at ");
+        builder.append(urlString);
+        builder.append(":");
+        builder.append(UString::number(lineNumber));
+        if (!function || ++count == maxStackSize)
+            break;
+        callFrame = callFrame->callerFrame();
+    }
+    return OpaqueJSString::create(builder.toUString()).leakRef();
+}
+
+