<!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>[165292] trunk/Source</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/165292">165292</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-03-07 14:16:00 -0800 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Notify system malloc of fake memory pressure.
<https://webkit.org/b/129908>
Source/WebCore:
After fixing the leak in <a href="http://trac.webkit.org/projects/webkit/changeset/165252">r165252</a>, I was surprised to find that it didn't
show up on memory test bots. It turns out that while the memory is now
getting freed, the system malloc implementation doesn't actually release
pages back to the OS until there is memory pressure.
Since we are just faking the memory pressure on bots, we have to let
system malloc in on the fun, so we can get representative numbers.
With this change, we should finally see the effect of not leaking the
URLRequest object tree.
Reviewed by Anders Carlsson.
* platform/mac/MemoryPressureHandlerMac.mm:
(WebCore::MemoryPressureHandler::install):
Tell system malloc that we are under fake memory pressure.
Source/WebKit2:
Reviewed by Anders Carlsson.
* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcess):
Listen for the fake memory pressure notification and respond by
just forwarding to system malloc. We don't do the full WebCore
memory pressure handling here, since that will cause stuff that
the network process doesn't need to get instantiated.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacMemoryPressureHandlerMacmm">trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165291 => 165292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-07 22:06:57 UTC (rev 165291)
+++ trunk/Source/WebCore/ChangeLog 2014-03-07 22:16:00 UTC (rev 165292)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-03-07 Andreas Kling <akling@apple.com>
+
+ [Mac] Notify system malloc of fake memory pressure.
+ <https://webkit.org/b/129908>
+
+ After fixing the leak in r165252, I was surprised to find that it didn't
+ show up on memory test bots. It turns out that while the memory is now
+ getting freed, the system malloc implementation doesn't actually release
+ pages back to the OS until there is memory pressure.
+
+ Since we are just faking the memory pressure on bots, we have to let
+ system malloc in on the fun, so we can get representative numbers.
+ With this change, we should finally see the effect of not leaking the
+ URLRequest object tree.
+
+ Reviewed by Anders Carlsson.
+
+ * platform/mac/MemoryPressureHandlerMac.mm:
+ (WebCore::MemoryPressureHandler::install):
+
+ Tell system malloc that we are under fake memory pressure.
+
</ins><span class="cx"> 2014-03-07 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] WebKit1 scroll position is incorrect
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacMemoryPressureHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm (165291 => 165292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2014-03-07 22:06:57 UTC (rev 165291)
+++ trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2014-03-07 22:16:00 UTC (rev 165292)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="cx"> #import <wtf/FastMalloc.h>
</span><span class="cx"> #import <wtf/Functional.h>
</span><ins>+#import <malloc/malloc.h>
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><span class="lines">@@ -85,6 +86,7 @@
</span><span class="cx"> notify_register_dispatch("org.WebKit.lowMemory", &_notifyToken, dispatch_get_main_queue(), ^(int) {
</span><span class="cx"> memoryPressureHandler().respondToMemoryPressure();
</span><span class="cx"> gcController().garbageCollectSoon();
</span><ins>+ malloc_zone_pressure_relief(nullptr, 0);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> m_installed = true;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165291 => 165292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-07 22:06:57 UTC (rev 165291)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-07 22:16:00 UTC (rev 165292)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-07 Andreas Kling <akling@apple.com>
+
+ [Mac] Notify system malloc of fake memory pressure.
+ <https://webkit.org/b/129908>
+
+ Reviewed by Anders Carlsson.
+
+ * NetworkProcess/mac/NetworkProcessMac.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+
+ Listen for the fake memory pressure notification and respond by
+ just forwarding to system malloc. We don't do the full WebCore
+ memory pressure handling here, since that will cause stuff that
+ the network process doesn't need to get instantiated.
+
</ins><span class="cx"> 2014-03-07 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Attempt to fix the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm (165291 => 165292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2014-03-07 22:06:57 UTC (rev 165291)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2014-03-07 22:16:00 UTC (rev 165292)
</span><span class="lines">@@ -42,6 +42,8 @@
</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><ins>+#import <malloc/malloc.h>
+#import <notify.h>
</ins><span class="cx"> #import <sysexits.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -112,6 +114,11 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><ins>+ static int notifyToken;
+ notify_register_dispatch("org.WebKit.lowMemory", &notifyToken, dispatch_get_main_queue(), ^(int) {
+ malloc_zone_pressure_relief(nullptr, 0);
+ });
+
</ins><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>