Changeset 136773 in webkit

Timestamp:

Dec 5, 2012, 3:43:06 PM (12 years ago)

Author:

oliver@apple.com

Message:

Empty parse cache when receiving a low memory warning
​https://bugs.webkit.org/show_bug.cgi?id=104161

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

This adds a function to the globaldata to empty all code related data
structures (code in the heap and the code cache).
It also adds a function to allow the CodeCache to actually be cleared
at all.

• runtime/CodeCache.h:

(CacheMap):
(JSC::CacheMap::clear):
(JSC::CodeCache::clear):
(CodeCache):

• runtime/JSGlobalData.cpp:

(JSC::JSGlobalData::discardAllCode):
(JSC):

• runtime/JSGlobalData.h:

(JSGlobalData):

Source/WebCore:

Use new discardAllCode() function on the global data, rather than
directly interacting with the heap.

• bindings/js/GCController.cpp:

(WebCore::GCController::discardAllCompiledCode):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def (modified) (1 diff)
• JavaScriptCore/runtime/CodeCache.h (modified) (2 diffs)
• JavaScriptCore/runtime/JSGlobalData.cpp (modified) (1 diff)
• JavaScriptCore/runtime/JSGlobalData.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/GCController.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-12-05  Oliver Hunt  <oliver@apple.com>
+
+        Empty parse cache when receiving a low memory warning
+        https://bugs.webkit.org/show_bug.cgi?id=104161
+
+        Reviewed by Filip Pizlo.
+
+        This adds a function to the globaldata to empty all code related data
+        structures (code in the heap and the code cache).
+        It also adds a function to allow the CodeCache to actually be cleared
+        at all. 
+
+        * runtime/CodeCache.h:
+        (CacheMap):
+        (JSC::CacheMap::clear):
+        (JSC::CodeCache::clear):
+        (CodeCache):
+        * runtime/JSGlobalData.cpp:
+        (JSC::JSGlobalData::discardAllCode):
+        (JSC):
+        * runtime/JSGlobalData.h:
+        (JSGlobalData):
+
 2012-12-05  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def

@@ -188 +188 @@
     ?detachThread@WTF@@YAXI@Z
     ?didTimeOut@TimeoutChecker@JSC@@QAE_NPAVExecState@2@@Z
+    ?discardAllCode@JSGlobalData@JSC@@QAEXXZ
     ?displayName@JSFunction@JSC@@QAE?AVString@WTF@@PAVExecState@2@@Z
     ?dtoa@WTF@@YAXQADNAA_NAAHAAI@Z

trunk/Source/JavaScriptCore/runtime/CodeCache.h

@@ -83 +83 @@
         ASSERT(m_map.size() <= CacheSize);
     }
+
+    void clear()
+    {
+        m_map.clear();
+        for (size_t i = 0; i < CacheSize; i++) {
+            m_data[i].first = KeyType();
+            m_data[i].second = EntryType();
+        }
+    }
+
+
 private:
     HashMap<KeyType, unsigned> m_map;
@@ -99 +110 @@
     void usedFunctionCode(JSGlobalData&, UnlinkedFunctionCodeBlock*);
     ~CodeCache();
+
+    void clear()
+    {
+        m_cachedCodeBlocks.clear();
+        m_cachedFunctionExecutables.clear();
+        m_cachedGlobalFunctions.clear();
+        m_recentlyUsedFunctionCode.clear();
+    }
 
     enum CodeType { EvalType, ProgramType, FunctionCallType, FunctionConstructType };

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -432 +432 @@
 }
 
+void JSGlobalData::discardAllCode()
+{
+    m_codeCache->clear();
+    heap.deleteAllCompiledCode();
+}
+
 void JSGlobalData::dumpSampleData(ExecState* exec)
 {

trunk/Source/JavaScriptCore/runtime/JSGlobalData.h

@@ -451 +451 @@
         CodeCache* codeCache() { return m_codeCache.get(); }
 
+        JS_EXPORT_PRIVATE void discardAllCode();
+
     private:
         friend class LLIntOffsetsExtractor;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-05  Oliver Hunt  <oliver@apple.com>
+
+        Empty parse cache when receiving a low memory warning
+        https://bugs.webkit.org/show_bug.cgi?id=104161
+
+        Reviewed by Filip Pizlo.
+
+        Use new discardAllCode() function on the global data, rather than
+        directly interacting with the heap.
+
+        * bindings/js/GCController.cpp:
+        (WebCore::GCController::discardAllCompiledCode):
+
 2012-12-05  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/bindings/js/GCController.cpp

@@ -106 +106 @@
 {
     JSLockHolder lock(JSDOMWindow::commonJSGlobalData());
-    JSDOMWindow::commonJSGlobalData()->heap.deleteAllCompiledCode();
+    JSDOMWindow::commonJSGlobalData()->discardAllCode();
 }