<!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>[165342] 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/165342">165342</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-03-08 16:49:57 -0800 (Sat, 08 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Improve the network process low memory handler.
<https://webkit.org/b/129977>
Split the network process low memory handler into platform-specific
and shared parts. The shared part tells FastMalloc to release freed
pages back to the OS.
For Mac, added a call to purge the in-memory part of CFURLCache.
Remove the malloc_zone_pressure_relief() since that is now taken care
of by the shared MemoryPressureHandler code.
Reviewed by Darin Adler.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::initializeNetworkProcess):
(WebKit::NetworkProcess::lowMemoryHandler):
(WebKit::NetworkProcess::platformLowMemoryHandler):
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::NetworkProcess::platformLowMemoryHandler):
(WebKit::NetworkProcess::platformInitializeNetworkProcess):</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="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165341 => 165342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-09 00:14:00 UTC (rev 165341)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-09 00:49:57 UTC (rev 165342)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-03-08 Andreas Kling <akling@apple.com>
+
+ [WK2] Improve the network process low memory handler.
+ <https://webkit.org/b/129977>
+
+ Split the network process low memory handler into platform-specific
+ and shared parts. The shared part tells FastMalloc to release freed
+ pages back to the OS.
+
+ For Mac, added a call to purge the in-memory part of CFURLCache.
+ Remove the malloc_zone_pressure_relief() since that is now taken care
+ of by the shared MemoryPressureHandler code.
+
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::initializeNetworkProcess):
+ (WebKit::NetworkProcess::lowMemoryHandler):
+ (WebKit::NetworkProcess::platformLowMemoryHandler):
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/mac/NetworkProcessMac.mm:
+ (WebKit::NetworkProcess::platformLowMemoryHandler):
+ (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+
</ins><span class="cx"> 2014-03-08 Jae Hyun Park <jaepark@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove unnecessary casting in NetworkProcessMainUnix.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (165341 => 165342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2014-03-09 00:14:00 UTC (rev 165341)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2014-03-09 00:49:57 UTC (rev 165342)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #include "WebContextMessages.h"
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="cx"> #include <WebCore/Logging.h>
</span><ins>+#include <WebCore/MemoryPressureHandler.h>
</ins><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="lines">@@ -156,6 +157,9 @@
</span><span class="cx"> {
</span><span class="cx"> platformInitializeNetworkProcess(parameters);
</span><span class="cx">
</span><ins>+ memoryPressureHandler().setLowMemoryHandler(lowMemoryHandler);
+ memoryPressureHandler().install();
+
</ins><span class="cx"> setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) || USE(CFNETWORK)
</span><span class="lines">@@ -268,6 +272,12 @@
</span><span class="cx"> ChildProcess::terminate();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcess::lowMemoryHandler(bool critical)
+{
+ platformLowMemoryHandler(critical);
+ WTF::releaseFastMallocFreeMemory();
+}
+
</ins><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
</span><span class="cx"> {
</span><span class="lines">@@ -280,6 +290,10 @@
</span><span class="cx"> void NetworkProcess::initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+
+void NetworkProcess::platformLowMemoryHandler(bool)
+{
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (165341 => 165342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2014-03-09 00:14:00 UTC (rev 165341)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2014-03-09 00:49:57 UTC (rev 165342)
</span><span class="lines">@@ -82,6 +82,9 @@
</span><span class="cx"> virtual void terminate() override;
</span><span class="cx"> void platformTerminate();
</span><span class="cx">
</span><ins>+ static void lowMemoryHandler(bool critical);
+ static void platformLowMemoryHandler(bool critical);
+
</ins><span class="cx"> // ChildProcess
</span><span class="cx"> virtual void initializeProcess(const ChildProcessInitializationParameters&) override;
</span><span class="cx"> virtual void initializeProcessName(const ChildProcessInitializationParameters&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm (165341 => 165342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2014-03-09 00:14:00 UTC (rev 165341)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2014-03-09 00:49:57 UTC (rev 165342)
</span><span class="lines">@@ -38,18 +38,20 @@
</span><span class="cx"> #import <WebCore/CertificateInfo.h>
</span><span class="cx"> #import <WebCore/FileSystem.h>
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><ins>+#import <WebCore/MemoryPressureHandler.h>
</ins><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <mach/host_info.h>
</span><span class="cx"> #import <mach/mach.h>
</span><span class="cx"> #import <mach/mach_error.h>
</span><del>-#import <malloc/malloc.h>
</del><span class="cx"> #import <notify.h>
</span><span class="cx"> #import <sysexits.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</del><span class="cx"> typedef struct _CFURLCache* CFURLCacheRef;
</span><span class="cx"> extern "C" CFURLCacheRef CFURLCacheCopySharedURLCache();
</span><ins>+extern "C" void _CFURLCachePurgeMemoryCache(CFURLCacheRef);
+
+#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</ins><span class="cx"> extern "C" void _CFURLCacheSetMinSizeForVMCachedResource(CFURLCacheRef, CFIndex);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -112,13 +114,13 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+void NetworkProcess::platformLowMemoryHandler(bool)
+{
+ _CFURLCachePurgeMemoryCache(adoptCF(CFURLCacheCopySharedURLCache()).get());
+}
+
</ins><span class="cx"> void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><del>- static int notifyToken;
- notify_register_dispatch("org.WebKit.lowMemory", &notifyToken, dispatch_get_main_queue(), ^(int) {
- malloc_zone_pressure_relief(nullptr, 0);
- });
-
</del><span class="cx"> m_diskCacheDirectory = parameters.diskCacheDirectory;
</span><span class="cx">
</span><span class="cx"> if (!m_diskCacheDirectory.isNull()) {
</span></span></pre>
</div>
</div>
</body>
</html>