Changeset 35815 in webkit for trunk/JavaScriptCore/API

Timestamp:

Aug 18, 2008, 1:09:59 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Maciej.

Make JSGlobalContextRetain/Release actually work.

• API/JSContextRef.cpp: (JSGlobalContextRetain): (JSGlobalContextRelease): Ref/deref global data to give checking for globalData.refCount() some sense.

• API/tests/testapi.c: (main): Added a test for this bug.

• kjs/JSGlobalData.cpp: (KJS::JSGlobalData::~JSGlobalData): While checking for memory leaks, found that JSGlobalData::emptyList has changed to a pointer, but it was not destructed, causing a huge leak in run-webkit-tests --threaded.

Location:

trunk/JavaScriptCore/API

Files:

• JSContextRef.cpp (modified) (3 diffs)
• tests/testapi.c (modified) (1 diff)

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -82 +82 @@
 {
     ExecState* exec = toJS(ctx);
-    exec->globalData().heap->registerThread();
+    JSGlobalData& globalData = exec->globalData();
+
+    globalData.heap->registerThread();
 
     gcProtect(exec->dynamicGlobalObject());
+    globalData.ref();
     return ctx;
 }
@@ -95 +98 @@
 
     JSGlobalData& globalData = exec->globalData();
-    if (globalData.refCount() == 1) {
+    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.
         Heap* heap = globalData.heap;
@@ -102 +105 @@
         ASSERT(!heap->isBusy());
 
-        // Heap destructor will delete JSGlobalObject, which will in turn delete JSGlobalData, which will
-        // delete the heap, which would cause a crash if allowed.
+        delete heap;
         globalData.heap = 0;
+    }
 
-        delete heap;
-    }
+    globalData.deref();
 }
 

trunk/JavaScriptCore/API/tests/testapi.c

@@ -582 +582 @@
     JSClassRef globalObjectClass = JSClassCreate(&globalObjectClassDefinition);
     context = JSGlobalContextCreate(globalObjectClass);
-    
+
+    JSGlobalContextRetain(context);
+    JSGlobalContextRelease(context);
+
     JSObjectRef globalObject = JSContextGetGlobalObject(context);
     ASSERT(JSValueIsObject(context, globalObject));