<!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>[211120] 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/211120">211120</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2017-01-24 16:15:00 -0800 (Tue, 24 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add memory footprint reporting using diagnostic logging.
<https://webkit.org/b/167285>
<rdar://problem/30151767>
Reviewed by Chris Dumez.
Add some basic logging of physical memory footprint post-load and post-backgrounding.
The logging works similarly to the CPU usage logging, though with slightly longer
delays to allow the measurement to stabilize.
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::memoryUsageKey):
(WebCore::DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey):
* page/DiagnosticLoggingKeys.h:
* page/PerformanceLogging.cpp:
(WebCore::PerformanceLogging::physicalFootprint):
* page/PerformanceLogging.h:
* page/PerformanceMonitor.cpp:
(WebCore::PerformanceMonitor::PerformanceMonitor):
(WebCore::PerformanceMonitor::didFinishLoad):
(WebCore::PerformanceMonitor::activityStateChanged):
(WebCore::PerformanceMonitor::measurePostLoadMemoryUsage):
(WebCore::PerformanceMonitor::measurePostBackgroundingMemoryUsage):
* page/PerformanceMonitor.h:
* page/Settings.h:
(WebCore::Settings::isPostLoadMemoryUsageMeasurementEnabled):
(WebCore::Settings::isPostBackgroundingMemoryUsageMeasurementEnabled):
* page/cocoa/PerformanceLoggingCocoa.mm:
(WebCore::PerformanceLogging::physicalFootprint):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingKeyscpp">trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingKeysh">trunk/Source/WebCore/page/DiagnosticLoggingKeys.h</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceLoggingcpp">trunk/Source/WebCore/page/PerformanceLogging.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceLoggingh">trunk/Source/WebCore/page/PerformanceLogging.h</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceMonitorcpp">trunk/Source/WebCore/page/PerformanceMonitor.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePerformanceMonitorh">trunk/Source/WebCore/page/PerformanceMonitor.h</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCorepagecocoaPerformanceLoggingCocoamm">trunk/Source/WebCore/page/cocoa/PerformanceLoggingCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211119 => 211120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-25 00:09:09 UTC (rev 211119)
+++ trunk/Source/WebCore/ChangeLog 2017-01-25 00:15:00 UTC (rev 211120)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2017-01-24 Andreas Kling <akling@apple.com>
+
+ Add memory footprint reporting using diagnostic logging.
+ <https://webkit.org/b/167285>
+ <rdar://problem/30151767>
+
+ Reviewed by Chris Dumez.
+
+ Add some basic logging of physical memory footprint post-load and post-backgrounding.
+ The logging works similarly to the CPU usage logging, though with slightly longer
+ delays to allow the measurement to stabilize.
+
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::memoryUsageKey):
+ (WebCore::DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey):
+ * page/DiagnosticLoggingKeys.h:
+ * page/PerformanceLogging.cpp:
+ (WebCore::PerformanceLogging::physicalFootprint):
+ * page/PerformanceLogging.h:
+ * page/PerformanceMonitor.cpp:
+ (WebCore::PerformanceMonitor::PerformanceMonitor):
+ (WebCore::PerformanceMonitor::didFinishLoad):
+ (WebCore::PerformanceMonitor::activityStateChanged):
+ (WebCore::PerformanceMonitor::measurePostLoadMemoryUsage):
+ (WebCore::PerformanceMonitor::measurePostBackgroundingMemoryUsage):
+ * page/PerformanceMonitor.h:
+ * page/Settings.h:
+ (WebCore::Settings::isPostLoadMemoryUsageMeasurementEnabled):
+ (WebCore::Settings::isPostBackgroundingMemoryUsageMeasurementEnabled):
+ * page/cocoa/PerformanceLoggingCocoa.mm:
+ (WebCore::PerformanceLogging::physicalFootprint):
+
</ins><span class="cx"> 2017-01-24 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove always true unsafePluginPastingEnabled setting
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (211119 => 211120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-01-25 00:09:09 UTC (rev 211119)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-01-25 00:15:00 UTC (rev 211120)
</span><span class="lines">@@ -328,6 +328,11 @@
</span><span class="cx"> return ASCIILiteral("cpuUsage");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::memoryUsageKey()
+{
+ return ASCIILiteral("memoryUsage");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::createSharedBufferFailedKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("createSharedBufferFailed");
</span><span class="lines">@@ -673,6 +678,33 @@
</span><span class="cx"> return ASCIILiteral("webGL");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey(uint64_t memoryUsage)
+{
+ if (memoryUsage < 32 * MB)
+ return ASCIILiteral("below32");
+ if (memoryUsage < 64 * MB)
+ return ASCIILiteral("32to64");
+ if (memoryUsage < 128 * MB)
+ return ASCIILiteral("64to128");
+ if (memoryUsage < 256 * MB)
+ return ASCIILiteral("128to256");
+ if (memoryUsage < 512 * MB)
+ return ASCIILiteral("256to512");
+ if (memoryUsage < 1024 * MB)
+ return ASCIILiteral("512to1024");
+ if (memoryUsage < 2048 * MB)
+ return ASCIILiteral("1024to2048");
+ if (memoryUsage < 4096llu * MB)
+ return ASCIILiteral("2048to4096");
+ if (memoryUsage < 8192llu * MB)
+ return ASCIILiteral("4096to8192");
+ if (memoryUsage < 16384llu * MB)
+ return ASCIILiteral("8192to16384");
+ if (memoryUsage < 32768llu * MB)
+ return ASCIILiteral("16384to32768");
+ return ASCIILiteral("over32768");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::foregroundCPUUsageToDiagnosticLoggingKey(double cpuUsage)
</span><span class="cx"> {
</span><span class="cx"> if (cpuUsage < 10)
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (211119 => 211120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-01-25 00:09:09 UTC (rev 211119)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-01-25 00:15:00 UTC (rev 211120)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> static String canCacheKey();
</span><span class="cx"> static String cannotSuspendActiveDOMObjectsKey();
</span><span class="cx"> WEBCORE_EXPORT static String cpuUsageKey();
</span><ins>+ WEBCORE_EXPORT static String memoryUsageKey();
</ins><span class="cx"> WEBCORE_EXPORT static String createSharedBufferFailedKey();
</span><span class="cx"> WEBCORE_EXPORT static String deltaKey();
</span><span class="cx"> static String deniedByClientKey();
</span><span class="lines">@@ -159,6 +160,7 @@
</span><span class="cx"> WEBCORE_EXPORT static String webViewKey();
</span><span class="cx"> WEBCORE_EXPORT static String zoomedKey();
</span><span class="cx">
</span><ins>+ WEBCORE_EXPORT static String memoryUsageToDiagnosticLoggingKey(uint64_t memoryUsage);
</ins><span class="cx"> WEBCORE_EXPORT static String foregroundCPUUsageToDiagnosticLoggingKey(double cpuUsage);
</span><span class="cx"> WEBCORE_EXPORT static String backgroundCPUUsageToDiagnosticLoggingKey(double cpuUsage);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceLogging.cpp (211119 => 211120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceLogging.cpp 2017-01-25 00:09:09 UTC (rev 211119)
+++ trunk/Source/WebCore/page/PerformanceLogging.cpp 2017-01-25 00:15:00 UTC (rev 211120)
</span><span class="lines">@@ -103,6 +103,7 @@
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> void PerformanceLogging::getPlatformMemoryUsageStatistics(HashMap<const char*, size_t>&) { }
</span><ins>+std::optional<uint64_t> PerformanceLogging::physicalFootprint() { return std::nullopt; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceLogging.h (211119 => 211120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceLogging.h 2017-01-25 00:09:09 UTC (rev 211119)
+++ trunk/Source/WebCore/page/PerformanceLogging.h 2017-01-25 00:15:00 UTC (rev 211120)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static HashCountedSet<const char*> javaScriptObjectCounts();
</span><span class="cx"> WEBCORE_EXPORT static HashMap<const char*, size_t> memoryUsageStatistics(ShouldIncludeExpensiveComputations);
</span><ins>+ WEBCORE_EXPORT static std::optional<uint64_t> physicalFootprint();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static void getPlatformMemoryUsageStatistics(HashMap<const char*, size_t>&);
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceMonitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceMonitor.cpp (211119 => 211120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceMonitor.cpp 2017-01-25 00:09:09 UTC (rev 211119)
+++ trunk/Source/WebCore/page/PerformanceMonitor.cpp 2017-01-25 00:15:00 UTC (rev 211120)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "DiagnosticLoggingKeys.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "Page.h"
</span><ins>+#include "PerformanceLogging.h"
</ins><span class="cx"> #include "Settings.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -43,6 +44,8 @@
</span><span class="cx"> static const std::chrono::minutes backgroundCPUUsageMeasurementDuration { 5 };
</span><span class="cx"> static const std::chrono::minutes cpuUsageSamplingInterval { 10 };
</span><span class="cx">
</span><ins>+static const std::chrono::seconds memoryUsageMeasurementDelay { 10 };
+
</ins><span class="cx"> static inline ActivityStateForCPUSampling activityStateForCPUSampling(ActivityState::Flags state)
</span><span class="cx"> {
</span><span class="cx"> if (!(state & ActivityState::IsVisible))
</span><span class="lines">@@ -57,6 +60,8 @@
</span><span class="cx"> , m_postPageLoadCPUUsageTimer(*this, &PerformanceMonitor::measurePostLoadCPUUsage)
</span><span class="cx"> , m_postBackgroundingCPUUsageTimer(*this, &PerformanceMonitor::measurePostBackgroundingCPUUsage)
</span><span class="cx"> , m_perActivityStateCPUUsageTimer(*this, &PerformanceMonitor::measurePerActivityStateCPUUsage)
</span><ins>+ , m_postPageLoadMemoryUsageTimer(*this, &PerformanceMonitor::measurePostLoadMemoryUsage)
+ , m_postBackgroundingMemoryUsageTimer(*this, &PerformanceMonitor::measurePostBackgroundingMemoryUsage)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!page.isUtilityPage());
</span><span class="cx">
</span><span class="lines">@@ -70,6 +75,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_postLoadCPUTime = std::nullopt;
</span><span class="cx"> m_postPageLoadCPUUsageTimer.stop();
</span><ins>+ m_postPageLoadMemoryUsageTimer.stop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PerformanceMonitor::didFinishLoad()
</span><span class="lines">@@ -79,6 +85,10 @@
</span><span class="cx"> m_postLoadCPUTime = std::nullopt;
</span><span class="cx"> m_postPageLoadCPUUsageTimer.startOneShot(cpuUsageMeasurementDelay);
</span><span class="cx"> }
</span><ins>+
+ // Likewise for post-load memory usage measurement.
+ if (Settings::isPostLoadMemoryUsageMeasurementEnabled() && m_page.isOnlyNonUtilityPage())
+ m_postPageLoadMemoryUsageTimer.startOneShot(memoryUsageMeasurementDelay);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PerformanceMonitor::activityStateChanged(ActivityState::Flags oldState, ActivityState::Flags newState)
</span><span class="lines">@@ -103,6 +113,13 @@
</span><span class="cx"> m_perActivityStateCPUUsageTimer.startRepeating(cpuUsageSamplingInterval);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ if (Settings::isPostBackgroundingMemoryUsageMeasurementEnabled() && visibilityChanged) {
+ if (newState & ActivityState::IsVisible)
+ m_postBackgroundingMemoryUsageTimer.stop();
+ else if (m_page.isOnlyNonUtilityPage())
+ m_postBackgroundingMemoryUsageTimer.startOneShot(memoryUsageMeasurementDelay);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PerformanceMonitor::measurePostLoadCPUUsage()
</span><span class="lines">@@ -127,6 +144,32 @@
</span><span class="cx"> m_page.diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::postPageLoadKey(), DiagnosticLoggingKeys::cpuUsageKey(), DiagnosticLoggingKeys::foregroundCPUUsageToDiagnosticLoggingKey(cpuUsage), ShouldSample::No);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PerformanceMonitor::measurePostLoadMemoryUsage()
+{
+ if (!m_page.isOnlyNonUtilityPage())
+ return;
+
+ std::optional<uint64_t> memoryUsage = PerformanceLogging::physicalFootprint();
+ if (!memoryUsage)
+ return;
+
+ RELEASE_LOG_IF_ALLOWED(PerformanceLogging, "measurePostLoadMemoryUsage: Process was using %llu bytes of memory after the page load.", memoryUsage.value());
+ m_page.diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::postPageLoadKey(), DiagnosticLoggingKeys::memoryUsageKey(), DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey(memoryUsage.value()), ShouldSample::No);
+}
+
+void PerformanceMonitor::measurePostBackgroundingMemoryUsage()
+{
+ if (!m_page.isOnlyNonUtilityPage())
+ return;
+
+ std::optional<uint64_t> memoryUsage = PerformanceLogging::physicalFootprint();
+ if (!memoryUsage)
+ return;
+
+ RELEASE_LOG_IF_ALLOWED(PerformanceLogging, "measurePostBackgroundingMemoryUsage: Process was using %llu bytes of memory after becoming non visible.", memoryUsage.value());
+ m_page.diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::postPageBackgroundingKey(), DiagnosticLoggingKeys::memoryUsageKey(), DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey(memoryUsage.value()), ShouldSample::No);
+}
+
</ins><span class="cx"> void PerformanceMonitor::measurePostBackgroundingCPUUsage()
</span><span class="cx"> {
</span><span class="cx"> if (!m_page.isOnlyNonUtilityPage()) {
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceMonitorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceMonitor.h (211119 => 211120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceMonitor.h 2017-01-25 00:09:09 UTC (rev 211119)
+++ trunk/Source/WebCore/page/PerformanceMonitor.h 2017-01-25 00:15:00 UTC (rev 211120)
</span><span class="lines">@@ -48,6 +48,9 @@
</span><span class="cx"> void measurePerActivityStateCPUUsage();
</span><span class="cx"> void measureCPUUsageInActivityState(ActivityStateForCPUSampling);
</span><span class="cx">
</span><ins>+ void measurePostLoadMemoryUsage();
+ void measurePostBackgroundingMemoryUsage();
+
</ins><span class="cx"> Page& m_page;
</span><span class="cx">
</span><span class="cx"> Timer m_postPageLoadCPUUsageTimer;
</span><span class="lines">@@ -56,6 +59,9 @@
</span><span class="cx"> std::optional<CPUTime> m_postBackgroundingCPUTime;
</span><span class="cx"> Timer m_perActivityStateCPUUsageTimer;
</span><span class="cx"> std::optional<CPUTime> m_perActivityStateCPUTime;
</span><ins>+
+ Timer m_postPageLoadMemoryUsageTimer;
+ Timer m_postBackgroundingMemoryUsageTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (211119 => 211120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2017-01-25 00:09:09 UTC (rev 211119)
+++ trunk/Source/WebCore/page/Settings.h 2017-01-25 00:15:00 UTC (rev 211120)
</span><span class="lines">@@ -203,6 +203,9 @@
</span><span class="cx"> static bool isPostBackgroundingCPUUsageMeasurementEnabled();
</span><span class="cx"> static bool isPerActivityStateCPUUsageMeasurementEnabled();
</span><span class="cx">
</span><ins>+ static bool isPostLoadMemoryUsageMeasurementEnabled();
+ static bool isPostBackgroundingMemoryUsageMeasurementEnabled();
+
</ins><span class="cx"> static bool globalConstRedeclarationShouldThrow();
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void setBackgroundShouldExtendBeyondPage(bool);
</span><span class="lines">@@ -451,4 +454,22 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool Settings::isPostLoadMemoryUsageMeasurementEnabled()
+{
+#if PLATFORM(COCOA)
+ return true;
+#else
+ return false;
+#endif
+}
+
+inline bool Settings::isPostBackgroundingMemoryUsageMeasurementEnabled()
+{
+#if PLATFORM(MAC)
+ return true;
+#else
+ return false;
+#endif
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaPerformanceLoggingCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/PerformanceLoggingCocoa.mm (211119 => 211120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/PerformanceLoggingCocoa.mm 2017-01-25 00:09:09 UTC (rev 211119)
+++ trunk/Source/WebCore/page/cocoa/PerformanceLoggingCocoa.mm 2017-01-25 00:15:00 UTC (rev 211120)
</span><span class="lines">@@ -31,6 +31,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+std::optional<uint64_t> PerformanceLogging::physicalFootprint()
+{
+ task_vm_info_data_t vmInfo;
+ mach_msg_type_number_t count = TASK_VM_INFO_COUNT;
+ kern_return_t result = task_info(mach_task_self(), TASK_VM_INFO, (task_info_t) &vmInfo, &count);
+ if (result != KERN_SUCCESS)
+ return std::nullopt;
+ return vmInfo.phys_footprint;
+}
+
</ins><span class="cx"> void PerformanceLogging::getPlatformMemoryUsageStatistics(HashMap<const char*, size_t>& stats)
</span><span class="cx"> {
</span><span class="cx"> task_vm_info_data_t vmInfo;
</span></span></pre>
</div>
</div>
</body>
</html>