Changeset 113445 in webkit for trunk/Source/JavaScriptCore/heap

Timestamp:

Apr 6, 2012, 9:09:22 AM (13 years ago)

Author:

[email protected]

Message:

Call Heap::discardAllCompiledCode() in low memory situations
​https://bugs.webkit.org/show_bug.cgi?id=83335

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Restructured Heap::discardAllCompiledCode() to do the "Is JavaScriptRunning?"
check inline so that it can be called directly without this check.

• heap/Heap.cpp:

(JSC::Heap::discardAllCompiledCode):
(JSC::Heap::collectAllGarbage):

• heap/Heap.h: Added JS_EXPORT_PRIVATE to discardAllCompiledCode() so it can be

called from WebCore.
(Heap):

• runtime/JSGlobalData.h: Removed unused " void discardAllCompiledCode()" declaration.

(JSGlobalData):

Source/WebCore:

Added call to discardAllCompiledCode() when under memory pressure.
We can re-JIT as needed. This is similar to what we used to do when we did
a full GC which also cleaned up JIT code. Doing a full GC typically didn't
help our memory situation, in fact it made things worse in the really low
memory situation as it caused more paging.

Added pass through discardAllCompiledCode() method to GCController.

• bindings/js/GCController.cpp:

(WebCore::GCController::discardAllCompiledCode):
(WebCore):

• bindings/js/GCController.h:

(GCController):

• platform/mac/MemoryPressureHandlerMac.mm:

(WebCore::MemoryPressureHandler::releaseMemory):

Location:

trunk/Source/JavaScriptCore/heap

Files:

• Heap.cpp (modified) (2 diffs)
• Heap.h (modified) (1 diff)

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -773 +773 @@
     // If JavaScript is running, it's not safe to recompile, since we'll end
     // up throwing away code that is live on the stack.
-    ASSERT(!m_globalData->dynamicGlobalObject);
-    
+    if (m_globalData->dynamicGlobalObject)
+        return;
+
     for (FunctionExecutable* current = m_functions.head(); current; current = current->next())
         current->discardCode();
@@ -783 +784 @@
     if (!m_isSafeToCollect)
         return;
-    if (!m_globalData->dynamicGlobalObject)
-        discardAllCompiledCode();
+    discardAllCompiledCode();
 
     collect(DoSweep);

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -149 +149 @@
         double lastGCLength() { return m_lastGCLength; }
 
-        void discardAllCompiledCode();
+        JS_EXPORT_PRIVATE void discardAllCompiledCode();
 
     private: