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

Timestamp:

Jul 3, 2008, 12:44:43 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff.

Don't create unnecessary JSGlobalData instances.

• kjs/JSGlobalData.h:
• kjs/JSGlobalData.cpp: (KJS::JSGlobalData::threadInstanceExists): (KJS::JSGlobalData::sharedInstanceExists): (KJS::JSGlobalData::threadInstance): (KJS::JSGlobalData::sharedInstance): (KJS::JSGlobalData::threadInstanceInternal): (KJS::JSGlobalData::sharedInstanceInternal): Added methods to query instance existence.

• kjs/InitializeThreading.cpp: (KJS::initializeThreadingOnce): Initialize thread instance static in a new way.

• API/JSBase.cpp: (JSGarbageCollect):
• kjs/collector.cpp: (KJS::Heap::collect): Check for instance existence before accessing it.

File:

• trunk/JavaScriptCore/API/JSBase.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSBase.cpp

@@ -89 +89 @@
     // and it may actually be garbage for some clients (most likely, because of JSGarbageCollect being called after releasing the context).
 
-    // 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();
+    if (JSGlobalData::threadInstanceExists()) {
+        Heap* heap = JSGlobalData::threadInstance().heap;
+        if (!heap->isBusy())
+            heap->collect();
+    }
 
     JSLock lock(true);
 
-    // FIXME: Similarly, we shouldn't create a shared instance here.
-    heap = JSGlobalData::sharedInstance().heap;
-    if (!heap->isBusy())
-        heap->collect();
+    if (JSGlobalData::sharedInstanceExists()) {
+        Heap* heap = JSGlobalData::sharedInstance().heap;
+        if (!heap->isBusy())
+            heap->collect();
+    }
 
     // FIXME: Perhaps we should trigger a second mark and sweep