Changeset 34659 in webkit for trunk/JavaScriptCore/API/JSBase.cpp

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.

File:

• trunk/JavaScriptCore/API/JSBase.cpp (modified) (2 diffs)

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