<!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>[169746] 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/169746">169746</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-06-10 09:02:03 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WebKit2] Stay in "memory pressure" mode until told otherwise.
<https://webkit.org/b/133671>
When we receive the first memory pressure signal, flip the flag in
MemoryPressureHandler so that isUnderMemoryPressure() returns true
from then on, until the system tells us pressure levels are back
to normal.
The hold-off mechanism is disabled for iOS, that wasn't actually
needed in the first place, since the system is not going to spam
you with tons of notifications.
Also propagate the "critical" flag all the way from the system
to the pressure handler. Note that we don't actually do anything
differently based on the flag yet.
Reviewed by Sam Weinig.
* platform/MemoryPressureHandler.cpp:
(WebCore::MemoryPressureHandler::respondToMemoryPressure):
* platform/MemoryPressureHandler.h:
(WebCore::MemoryPressureHandler::setUnderMemoryPressure):
* platform/cocoa/MemoryPressureHandlerCocoa.mm:
(WebCore::MemoryPressureHandler::install):
(WebCore::MemoryPressureHandler::respondToMemoryPressure):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlercpp">trunk/Source/WebCore/platform/MemoryPressureHandler.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformMemoryPressureHandlerh">trunk/Source/WebCore/platform/MemoryPressureHandler.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm">trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169745 => 169746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-10 15:46:14 UTC (rev 169745)
+++ trunk/Source/WebCore/ChangeLog 2014-06-10 16:02:03 UTC (rev 169746)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-06-10 Andreas Kling <akling@apple.com>
+
+ [iOS WebKit2] Stay in "memory pressure" mode until told otherwise.
+ <https://webkit.org/b/133671>
+
+ When we receive the first memory pressure signal, flip the flag in
+ MemoryPressureHandler so that isUnderMemoryPressure() returns true
+ from then on, until the system tells us pressure levels are back
+ to normal.
+
+ The hold-off mechanism is disabled for iOS, that wasn't actually
+ needed in the first place, since the system is not going to spam
+ you with tons of notifications.
+
+ Also propagate the "critical" flag all the way from the system
+ to the pressure handler. Note that we don't actually do anything
+ differently based on the flag yet.
+
+ Reviewed by Sam Weinig.
+
+ * platform/MemoryPressureHandler.cpp:
+ (WebCore::MemoryPressureHandler::respondToMemoryPressure):
+ * platform/MemoryPressureHandler.h:
+ (WebCore::MemoryPressureHandler::setUnderMemoryPressure):
+ * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+ (WebCore::MemoryPressureHandler::install):
+ (WebCore::MemoryPressureHandler::respondToMemoryPressure):
+
</ins><span class="cx"> 2014-06-10 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix logging of sticky scrolling tree nodes
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (169745 => 169746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-06-10 15:46:14 UTC (rev 169745)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-06-10 16:02:03 UTC (rev 169746)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> void MemoryPressureHandler::install() { }
</span><span class="cx"> void MemoryPressureHandler::uninstall() { }
</span><span class="cx"> void MemoryPressureHandler::holdOff(unsigned) { }
</span><del>-void MemoryPressureHandler::respondToMemoryPressure() { }
</del><ins>+void MemoryPressureHandler::respondToMemoryPressure(bool) { }
</ins><span class="cx"> void MemoryPressureHandler::platformReleaseMemory(bool) { }
</span><span class="cx"> void MemoryPressureHandler::ReliefLogger::platformLog() { }
</span><span class="cx"> size_t MemoryPressureHandler::ReliefLogger::platformMemoryUsage() { return 0; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.h (169745 => 169746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.h 2014-06-10 15:46:14 UTC (rev 169745)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.h 2014-06-10 16:02:03 UTC (rev 169746)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isUnderMemoryPressure() const { return m_underMemoryPressure; }
</span><ins>+ void setUnderMemoryPressure(bool b) { m_underMemoryPressure = b; }
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // FIXME: Can we share more of this with OpenSource?
</span><span class="lines">@@ -107,7 +108,7 @@
</span><span class="cx"> MemoryPressureHandler();
</span><span class="cx"> ~MemoryPressureHandler();
</span><span class="cx">
</span><del>- void respondToMemoryPressure();
</del><ins>+ void respondToMemoryPressure(bool critical);
</ins><span class="cx"> static void platformReleaseMemory(bool critical);
</span><span class="cx">
</span><span class="cx"> bool m_installed;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm (169745 => 169746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2014-06-10 15:46:14 UTC (rev 169745)
+++ trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2014-06-10 16:02:03 UTC (rev 169746)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> dispatch_async(dispatch_get_main_queue(), ^{
</span><span class="cx"> #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
</span><del>- _cache_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_WARN | DISPATCH_MEMORYSTATUS_PRESSURE_CRITICAL, dispatch_get_main_queue());
</del><ins>+ _cache_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_NORMAL | DISPATCH_MEMORYSTATUS_PRESSURE_WARN | DISPATCH_MEMORYSTATUS_PRESSURE_CRITICAL, dispatch_get_main_queue());
</ins><span class="cx"> #elif PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="cx"> _cache_event_source = wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue();
</span><span class="cx"> #else
</span><span class="lines">@@ -88,7 +88,17 @@
</span><span class="cx"> if (_cache_event_source) {
</span><span class="cx"> dispatch_set_context(_cache_event_source, this);
</span><span class="cx"> dispatch_source_set_event_handler(_cache_event_source, ^{
</span><del>- memoryPressureHandler().respondToMemoryPressure();
</del><ins>+ bool critical = true;
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
+ unsigned long status = dispatch_source_get_data(_cache_event_source);
+ critical = status == DISPATCH_MEMORYPRESSURE_CRITICAL;
+ if (status == DISPATCH_MEMORYSTATUS_PRESSURE_NORMAL) {
+ memoryPressureHandler().setUnderMemoryPressure(false);
+ return;
+ }
+ memoryPressureHandler().setUnderMemoryPressure(true);
+#endif
+ memoryPressureHandler().respondToMemoryPressure(critical);
</ins><span class="cx"> });
</span><span class="cx"> dispatch_resume(_cache_event_source);
</span><span class="cx"> }
</span><span class="lines">@@ -101,7 +111,7 @@
</span><span class="cx"> // This gives us a more consistent picture of live objects at the end of testing.
</span><span class="cx"> gcController().garbageCollectNow();
</span><span class="cx">
</span><del>- memoryPressureHandler().respondToMemoryPressure();
</del><ins>+ memoryPressureHandler().respondToMemoryPressure(true);
</ins><span class="cx"> malloc_zone_pressure_relief(nullptr, 0);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -152,17 +162,18 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MemoryPressureHandler::respondToMemoryPressure()
</del><ins>+void MemoryPressureHandler::respondToMemoryPressure(bool critical)
</ins><span class="cx"> {
</span><span class="cx"> uninstall();
</span><span class="cx">
</span><span class="cx"> double startTime = monotonicallyIncreasingTime();
</span><span class="cx">
</span><del>- m_lowMemoryHandler(false);
</del><ins>+ m_lowMemoryHandler(critical);
</ins><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> unsigned holdOffTime = (monotonicallyIncreasingTime() - startTime) * s_holdOffMultiplier;
</span><del>-
</del><span class="cx"> holdOff(std::max(holdOffTime, s_minimumHoldOffTime));
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) || (PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</span></span></pre>
</div>
</div>
</body>
</html>