<!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>[185704] trunk/Source/WebKit2</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/185704">185704</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-06-18 10:15:50 -0700 (Thu, 18 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>~4% Membuster regression after WebKit <a href="http://trac.webkit.org/projects/webkit/changeset/185452">r185452</a>
https://bugs.webkit.org/show_bug.cgi?id=146112
rdar://problem/21406677
Reviewed by Chris Dumez.
Clear the cache write queue on critical memory pressure. There can be substantial amount of memory there and we
don't know how long writing it out will take. System is often under I/O pressure too in low memory situations.
This also makes sense for process suspension where we send simulated critical memory event.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::lowMemoryHandler):
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::Cache::handleMemoryPressureNotification):
* NetworkProcess/cache/NetworkCache.h:
* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::Storage::clearWriteQueue):
* NetworkProcess/cache/NetworkCacheStorage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185703 => 185704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-18 17:13:21 UTC (rev 185703)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-18 17:15:50 UTC (rev 185704)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-06-18 Antti Koivisto <antti@apple.com>
+
+ ~4% Membuster regression after WebKit r185452
+ https://bugs.webkit.org/show_bug.cgi?id=146112
+ rdar://problem/21406677
+
+ Reviewed by Chris Dumez.
+
+ Clear the cache write queue on critical memory pressure. There can be substantial amount of memory there and we
+ don't know how long writing it out will take. System is often under I/O pressure too in low memory situations.
+
+ This also makes sense for process suspension where we send simulated critical memory event.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::lowMemoryHandler):
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::handleMemoryPressureNotification):
+ * NetworkProcess/cache/NetworkCache.h:
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::clearWriteQueue):
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+
</ins><span class="cx"> 2015-06-18 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix missing braces and deprecated declarations warnings in WebKitNotificationProvider.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (185703 => 185704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-06-18 17:13:21 UTC (rev 185703)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-06-18 17:15:50 UTC (rev 185704)
</span><span class="lines">@@ -176,6 +176,10 @@
</span><span class="cx"> void NetworkProcess::lowMemoryHandler(Critical critical)
</span><span class="cx"> {
</span><span class="cx"> platformLowMemoryHandler(critical);
</span><ins>+#if ENABLE(NETWORK_CACHE)
+ if (NetworkCache::singleton().isEnabled())
+ NetworkCache::singleton().handleMemoryPressureNotification(critical);
+#endif
</ins><span class="cx"> WTF::releaseFastMallocFreeMemory();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (185703 => 185704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-06-18 17:13:21 UTC (rev 185703)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-06-18 17:15:50 UTC (rev 185704)
</span><span class="lines">@@ -562,6 +562,16 @@
</span><span class="cx"> clear(std::chrono::system_clock::time_point::min(), nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Cache::handleMemoryPressureNotification(WebCore::Critical critical)
+{
+ if (critical != WebCore::Critical::Yes)
+ return;
+ // There can be substantial amount of memory in the write queue and we don't know how long it will take to write it out.
+ // We may also be about to suspend the process.
+ if (m_storage)
+ m_storage->clearWriteQueue();
+}
+
</ins><span class="cx"> String Cache::recordsPath() const
</span><span class="cx"> {
</span><span class="cx"> return m_storage ? m_storage->recordsPath() : String();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (185703 => 185704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-06-18 17:13:21 UTC (rev 185703)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-06-18 17:15:50 UTC (rev 185704)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "NetworkCacheEntry.h"
</span><span class="cx"> #include "NetworkCacheStorage.h"
</span><span class="cx"> #include "ShareableResource.h"
</span><ins>+#include <WebCore/MemoryPressureHandler.h>
</ins><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -103,6 +104,8 @@
</span><span class="cx"> void clear();
</span><span class="cx"> void clear(std::chrono::system_clock::time_point modifiedSince, std::function<void ()>&& completionHandler);
</span><span class="cx">
</span><ins>+ void handleMemoryPressureNotification(WebCore::Critical);
+
</ins><span class="cx"> void dumpContentsToFile();
</span><span class="cx">
</span><span class="cx"> String recordsPath() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStoragecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (185703 => 185704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-06-18 17:13:21 UTC (rev 185703)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-06-18 17:15:50 UTC (rev 185704)
</span><span class="lines">@@ -862,6 +862,13 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Storage::clearWriteQueue()
+{
+ LOG(NetworkCacheStorage, "(NetworkProcess) clearing write queue");
+
+ m_pendingWriteOperations.clear();
+}
+
</ins><span class="cx"> void Storage::deleteOldVersions()
</span><span class="cx"> {
</span><span class="cx"> backgroundIOQueue().dispatch([this] {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheStorageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (185703 => 185704)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-06-18 17:13:21 UTC (rev 185703)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-06-18 17:15:50 UTC (rev 185704)
</span><span class="lines">@@ -80,6 +80,8 @@
</span><span class="cx"> // Null record signals end.
</span><span class="cx"> void traverse(TraverseFlags, TraverseHandler&&);
</span><span class="cx">
</span><ins>+ void clearWriteQueue();
+
</ins><span class="cx"> void setCapacity(size_t);
</span><span class="cx"> size_t capacity() const { return m_capacity; }
</span><span class="cx"> size_t approximateSize() const;
</span></span></pre>
</div>
</div>
</body>
</html>