<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[180192] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/180192">180192</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-02-16 17:06:45 -0800 (Mon, 16 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GC (almost) immediately when navigating under memory pressure.
<https://webkit.org/b/141663>
Reviewed by Geoffrey Garen.
Since the PageCache is already disabled in memory pressure situations,
we know that detaching the old window shell on navigation is basically
guaranteed to generate a bunch of garbage, we can soften the memory
peak a bit by doing a GC right away instead of scheduling one for soon(tm).
* bindings/js/GCController.cpp:
(WebCore::GCController::GCController):
(WebCore::GCController::garbageCollectSoon):
(WebCore::GCController::garbageCollectOnNextRunLoop):
(WebCore::GCController::gcTimerFired):
* bindings/js/GCController.h:
Add a GCController::garbageCollectOnNextRunLoop() complement to the
"soon" and "now" options. There was already a zero timer in here for
non-CF builds, so I just used that same timer to implement this
and have the non-CF code path call garbageCollectOnNextRunLoop().
* bindings/js/ScriptController.cpp:
(WebCore::collectGarbageAfterWindowShellDestruction):
(WebCore::ScriptController::~ScriptController):
(WebCore::ScriptController::clearWindowShell):
Under system memory pressure conditions, schedule a full GC on next
runloop iteration instead of just asking for it to happen soon.
We do it on next runloop to ensure that there's no pointer to the
window object on the stack.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsGCControllercpp">trunk/Source/WebCore/bindings/js/GCController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsGCControllerh">trunk/Source/WebCore/bindings/js/GCController.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180191 => 180192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-17 01:05:28 UTC (rev 180191)
+++ trunk/Source/WebCore/ChangeLog 2015-02-17 01:06:45 UTC (rev 180192)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2015-02-16 Andreas Kling <akling@apple.com>
+
+ GC (almost) immediately when navigating under memory pressure.
+ <https://webkit.org/b/141663>
+
+ Reviewed by Geoffrey Garen.
+
+ Since the PageCache is already disabled in memory pressure situations,
+ we know that detaching the old window shell on navigation is basically
+ guaranteed to generate a bunch of garbage, we can soften the memory
+ peak a bit by doing a GC right away instead of scheduling one for soon(tm).
+
+ * bindings/js/GCController.cpp:
+ (WebCore::GCController::GCController):
+ (WebCore::GCController::garbageCollectSoon):
+ (WebCore::GCController::garbageCollectOnNextRunLoop):
+ (WebCore::GCController::gcTimerFired):
+ * bindings/js/GCController.h:
+
+ Add a GCController::garbageCollectOnNextRunLoop() complement to the
+ "soon" and "now" options. There was already a zero timer in here for
+ non-CF builds, so I just used that same timer to implement this
+ and have the non-CF code path call garbageCollectOnNextRunLoop().
+
+ * bindings/js/ScriptController.cpp:
+ (WebCore::collectGarbageAfterWindowShellDestruction):
+ (WebCore::ScriptController::~ScriptController):
+ (WebCore::ScriptController::clearWindowShell):
+
+ Under system memory pressure conditions, schedule a full GC on next
+ runloop iteration instead of just asking for it to happen soon.
+ We do it on next runloop to ensure that there's no pointer to the
+ window object on the stack.
+
</ins><span class="cx"> 2015-02-16 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Emoji sequences do not render properly.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsGCControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/GCController.cpp (180191 => 180192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/GCController.cpp 2015-02-17 01:05:28 UTC (rev 180191)
+++ trunk/Source/WebCore/bindings/js/GCController.cpp 2015-02-17 01:06:45 UTC (rev 180192)
</span><span class="lines">@@ -50,9 +50,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GCController::GCController()
</span><del>-#if !USE(CF)
</del><span class="cx"> : m_GCTimer(*this, &GCController::gcTimerFired)
</span><del>-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -67,17 +65,20 @@
</span><span class="cx"> JSLockHolder lock(JSDOMWindow::commonVM());
</span><span class="cx"> JSDOMWindow::commonVM().heap.reportAbandonedObjectGraph();
</span><span class="cx"> #else
</span><ins>+ garbageCollectOnNextRunLoop();
+#endif
+}
+
+void GCController::garbageCollectOnNextRunLoop()
+{
</ins><span class="cx"> if (!m_GCTimer.isActive())
</span><span class="cx"> m_GCTimer.startOneShot(0);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#if !USE(CF)
</del><span class="cx"> void GCController::gcTimerFired()
</span><span class="cx"> {
</span><span class="cx"> collect(nullptr);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void GCController::garbageCollectNow()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsGCControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/GCController.h (180191 => 180192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/GCController.h 2015-02-17 01:05:28 UTC (rev 180191)
+++ trunk/Source/WebCore/bindings/js/GCController.h 2015-02-17 01:06:45 UTC (rev 180192)
</span><span class="lines">@@ -26,12 +26,9 @@
</span><span class="cx"> #ifndef GCController_h
</span><span class="cx"> #define GCController_h
</span><span class="cx">
</span><del>-#if USE(CF)
</del><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#else
</del><span class="cx"> #include "Timer.h"
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -42,6 +39,7 @@
</span><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT void garbageCollectSoon();
</span><span class="cx"> WEBCORE_EXPORT void garbageCollectNow(); // It's better to call garbageCollectSoon, unless you have a specific reason not to.
</span><ins>+ void garbageCollectOnNextRunLoop();
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void garbageCollectOnAlternateThreadForDebugging(bool waitUntilDone); // Used for stress testing.
</span><span class="cx"> WEBCORE_EXPORT void releaseExecutableMemory();
</span><span class="lines">@@ -51,10 +49,8 @@
</span><span class="cx"> private:
</span><span class="cx"> GCController(); // Use gcController() instead
</span><span class="cx">
</span><del>-#if !USE(CF)
</del><span class="cx"> void gcTimerFired();
</span><span class="cx"> Timer m_GCTimer;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Function to obtain the global GC controller.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (180191 => 180192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2015-02-17 01:05:28 UTC (rev 180191)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2015-02-17 01:06:45 UTC (rev 180192)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "JSDocument.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><span class="cx"> #include "MainFrame.h"
</span><ins>+#include "MemoryPressureHandler.h"
</ins><span class="cx"> #include "NP_jsobject.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageConsoleClient.h"
</span><span class="lines">@@ -60,6 +61,18 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static void collectGarbageAfterWindowShellDestruction()
+{
+ // Make sure to GC Extra Soon(tm) during memory pressure conditions
+ // to soften high peaks of memory usage during navigation.
+ if (memoryPressureHandler().isUnderMemoryPressure()) {
+ // NOTE: We do the collection on next runloop to ensure that there's no pointer
+ // to the window object on the stack.
+ gcController().garbageCollectOnNextRunLoop();
+ } else
+ gcController().garbageCollectSoon();
+}
+
</ins><span class="cx"> void ScriptController::initializeThreading()
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -98,7 +111,7 @@
</span><span class="cx"> iter->value->window()->setConsoleClient(nullptr);
</span><span class="cx"> destroyWindowShell(*iter->key);
</span><span class="cx"> }
</span><del>- gcController().garbageCollectSoon();
</del><ins>+ collectGarbageAfterWindowShellDestruction();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -227,7 +240,7 @@
</span><span class="cx"> // It's likely that resetting our windows created a lot of garbage, unless
</span><span class="cx"> // it went in a back/forward cache.
</span><span class="cx"> if (!goingIntoPageCache)
</span><del>- gcController().garbageCollectSoon();
</del><ins>+ collectGarbageAfterWindowShellDestruction();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSDOMWindowShell* ScriptController::initScript(DOMWrapperWorld& world)
</span></span></pre>
</div>
</div>
</body>
</html>