<!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>[169236] 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/169236">169236</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 18:34:26 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Hook up a setting for showing detailed logging during memory pressure relief.
<https://webkit.org/b/133194>
Source/WebCore:
Make the pressure relief logger opt-in. Also make it flush memory back to the
OS (for both malloc and FastMalloc) to get more accurate numbers at each step.
Reviewed by Gavin Barraclough.
* WebCore.exp.in:
* platform/MemoryPressureHandler.cpp:
* platform/MemoryPressureHandler.h:
(WebCore::MemoryPressureHandler::ReliefLogger::ReliefLogger):
(WebCore::MemoryPressureHandler::ReliefLogger::~ReliefLogger):
(WebCore::MemoryPressureHandler::ReliefLogger::setLoggingEnabled):
* platform/cocoa/MemoryPressureHandlerCocoa.mm:
(WebCore::MemoryPressureHandler::ReliefLogger::platformMemoryUsage):
Source/WebKit2:
Plumb through the same setting that we used for detailed logging in WK1.
Reviewed by Gavin Barraclough.
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformInitializeWebProcess):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</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>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169235 => 169236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-23 01:29:30 UTC (rev 169235)
+++ trunk/Source/WebCore/ChangeLog 2014-05-23 01:34:26 UTC (rev 169236)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-22 Andreas Kling <akling@apple.com>
+
+ Hook up a setting for showing detailed logging during memory pressure relief.
+ <https://webkit.org/b/133194>
+
+ Make the pressure relief logger opt-in. Also make it flush memory back to the
+ OS (for both malloc and FastMalloc) to get more accurate numbers at each step.
+
+ Reviewed by Gavin Barraclough.
+
+ * WebCore.exp.in:
+ * platform/MemoryPressureHandler.cpp:
+ * platform/MemoryPressureHandler.h:
+ (WebCore::MemoryPressureHandler::ReliefLogger::ReliefLogger):
+ (WebCore::MemoryPressureHandler::ReliefLogger::~ReliefLogger):
+ (WebCore::MemoryPressureHandler::ReliefLogger::setLoggingEnabled):
+ * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+ (WebCore::MemoryPressureHandler::ReliefLogger::platformMemoryUsage):
+
</ins><span class="cx"> 2014-05-22 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't scan for phone numbers in editable regions
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (169235 => 169236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-05-23 01:29:30 UTC (rev 169235)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-05-23 01:34:26 UTC (rev 169236)
</span><span class="lines">@@ -875,6 +875,7 @@
</span><span class="cx"> __ZN7WebCore21BlobDataFileReferenceD2Ev
</span><span class="cx"> __ZN7WebCore21CrossThreadCopierBaseILb0ELb0EN3WTF6StringEE4copyERKS2_
</span><span class="cx"> __ZN7WebCore21CrossThreadCopierBaseILb0ELb0ENS_19IDBDatabaseMetadataEE4copyERKS1_
</span><ins>+__ZN7WebCore21MemoryPressureHandler12ReliefLogger16s_loggingEnabledE
</ins><span class="cx"> __ZN7WebCore21MemoryPressureHandler7installEv
</span><span class="cx"> __ZN7WebCore21NetworkStorageSession21defaultStorageSessionEv
</span><span class="cx"> __ZN7WebCore21NetworkStorageSession25switchToNewTestingSessionEv
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.cpp (169235 => 169236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-05-23 01:29:30 UTC (rev 169235)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.cpp 2014-05-23 01:34:26 UTC (rev 169236)
</span><span class="lines">@@ -45,6 +45,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+bool MemoryPressureHandler::ReliefLogger::s_loggingEnabled = false;
+
</ins><span class="cx"> MemoryPressureHandler& memoryPressureHandler()
</span><span class="cx"> {
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(MemoryPressureHandler, staticMemoryPressureHandler, ());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMemoryPressureHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MemoryPressureHandler.h (169235 => 169236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MemoryPressureHandler.h 2014-05-23 01:29:30 UTC (rev 169235)
+++ trunk/Source/WebCore/platform/MemoryPressureHandler.h 2014-05-23 01:34:26 UTC (rev 169236)
</span><span class="lines">@@ -74,16 +74,18 @@
</span><span class="cx"> public:
</span><span class="cx"> explicit ReliefLogger(const char *log)
</span><span class="cx"> : m_logString(log)
</span><del>- , m_initialMemory(platformMemoryUsage())
</del><ins>+ , m_initialMemory(s_loggingEnabled ? platformMemoryUsage() : 0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~ReliefLogger()
</span><span class="cx"> {
</span><del>- platformLog();
</del><ins>+ if (s_loggingEnabled)
+ platformLog();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* logString() const { return m_logString; }
</span><ins>+ static void setLoggingEnabled(bool enabled) { s_loggingEnabled = enabled; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> size_t platformMemoryUsage();
</span><span class="lines">@@ -91,8 +93,10 @@
</span><span class="cx">
</span><span class="cx"> const char* m_logString;
</span><span class="cx"> size_t m_initialMemory;
</span><del>-};
</del><span class="cx">
</span><ins>+ static bool s_loggingEnabled;
+ };
+
</ins><span class="cx"> private:
</span><span class="cx"> void uninstall();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaMemoryPressureHandlerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm (169235 => 169236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2014-05-23 01:29:30 UTC (rev 169235)
+++ trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2014-05-23 01:34:26 UTC (rev 169236)
</span><span class="lines">@@ -170,6 +170,11 @@
</span><span class="cx"> #if PLATFORM(IOS) || (PLATFORM(MAC) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</span><span class="cx"> size_t MemoryPressureHandler::ReliefLogger::platformMemoryUsage()
</span><span class="cx"> {
</span><ins>+ // Flush free memory back to the OS before every measurement.
+ // Note that this code only runs when detailed pressure relief logging is enabled.
+ WTF::releaseFastMallocFreeMemory();
+ malloc_zone_pressure_relief(nullptr, 0);
+
</ins><span class="cx"> task_vm_info_data_t vmInfo;
</span><span class="cx"> mach_msg_type_number_t count = TASK_VM_INFO_COUNT;
</span><span class="cx"> kern_return_t err = task_info(mach_task_self(), TASK_VM_INFO, (task_info_t) &vmInfo, &count);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169235 => 169236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-23 01:29:30 UTC (rev 169235)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-23 01:34:26 UTC (rev 169236)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-22 Andreas Kling <akling@apple.com>
+
+ Hook up a setting for showing detailed logging during memory pressure relief.
+ <https://webkit.org/b/133194>
+
+ Plumb through the same setting that we used for detailed logging in WK1.
+
+ Reviewed by Gavin Barraclough.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformInitializeWebProcess):
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2014-05-22 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Send shareable resources to QuickLook if enabled
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (169235 => 169236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-05-23 01:29:30 UTC (rev 169235)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-05-23 01:34:26 UTC (rev 169236)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> , shouldEnableKerningAndLigaturesByDefault(false)
</span><span class="cx"> , shouldEnableJIT(false)
</span><span class="cx"> , shouldEnableFTLJIT(false)
</span><ins>+ , shouldEnableMemoryPressureReliefLogging(false)
</ins><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> , usesNetworkProcess(false)
</span><span class="lines">@@ -113,6 +114,7 @@
</span><span class="cx"> encoder << shouldEnableKerningAndLigaturesByDefault;
</span><span class="cx"> encoder << shouldEnableJIT;
</span><span class="cx"> encoder << shouldEnableFTLJIT;
</span><ins>+ encoder << shouldEnableMemoryPressureReliefLogging;
</ins><span class="cx"> encoder << !!bundleParameterData;
</span><span class="cx"> if (bundleParameterData)
</span><span class="cx"> encoder << bundleParameterData->dataReference();
</span><span class="lines">@@ -242,6 +244,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.shouldEnableFTLJIT))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(parameters.shouldEnableMemoryPressureReliefLogging))
+ return false;
</ins><span class="cx">
</span><span class="cx"> bool hasBundleParameterData;
</span><span class="cx"> if (!decoder.decode(hasBundleParameterData))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (169235 => 169236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-05-23 01:29:30 UTC (rev 169235)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-05-23 01:34:26 UTC (rev 169236)
</span><span class="lines">@@ -136,6 +136,7 @@
</span><span class="cx"> bool shouldEnableKerningAndLigaturesByDefault;
</span><span class="cx"> bool shouldEnableJIT;
</span><span class="cx"> bool shouldEnableFTLJIT;
</span><ins>+ bool shouldEnableMemoryPressureReliefLogging;
</ins><span class="cx">
</span><span class="cx"> RefPtr<API::Data> bundleParameterData;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (169235 => 169236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-05-23 01:29:30 UTC (rev 169235)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-05-23 01:34:26 UTC (rev 169236)
</span><span class="lines">@@ -186,6 +186,7 @@
</span><span class="cx"> parameters.shouldEnableKerningAndLigaturesByDefault = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
</span><span class="cx"> parameters.shouldEnableJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCJITEnabledDefaultsKey];
</span><span class="cx"> parameters.shouldEnableFTLJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCFTLJITEnabledDefaultsKey];
</span><ins>+ parameters.shouldEnableMemoryPressureReliefLogging = [[NSUserDefaults standardUserDefaults] boolForKey:@"LogMemoryJetsamDetails"];
</ins><span class="cx">
</span><span class="cx"> #if HAVE(HOSTED_CORE_ANIMATION)
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (169235 => 169236)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-05-23 01:29:30 UTC (rev 169235)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-05-23 01:34:26 UTC (rev 169236)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #import <WebCore/Font.h>
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/MemoryCache.h>
</span><ins>+#import <WebCore/MemoryPressureHandler.h>
</ins><span class="cx"> #import <WebCore/PageCache.h>
</span><span class="cx"> #import <WebCore/WebCoreNSURLExtras.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="lines">@@ -191,6 +192,8 @@
</span><span class="cx"> m_shouldForceScreenFontSubstitution = parameters.shouldForceScreenFontSubstitution;
</span><span class="cx"> Font::setDefaultTypesettingFeatures(parameters.shouldEnableKerningAndLigaturesByDefault ? Kerning | Ligatures : 0);
</span><span class="cx">
</span><ins>+ MemoryPressureHandler::ReliefLogger::setLoggingEnabled(parameters.shouldEnableMemoryPressureReliefLogging);
+
</ins><span class="cx"> setEnhancedAccessibility(parameters.accessibilityEnhancedUserInterfaceEnabled);
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span></span></pre>
</div>
</div>
</body>
</html>