<!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>[212961] 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/212961">212961</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-02-24 11:24:21 -0800 (Fri, 24 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Report domains using abnormally high memory usage via enhanced privacy logging
https://bugs.webkit.org/show_bug.cgi?id=168797
<rdar://problem/29964017>
Reviewed by Andreas Kling.
Report domains using abnormally high memory usage (> 2GB) via enhanced privacy
logging on Mac.
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::domainCausingJetsamKey):
* page/DiagnosticLoggingKeys.h:
* page/PerformanceMonitor.cpp:
(WebCore::reportPageOverPostLoadResourceThreshold):
(WebCore::PerformanceMonitor::measurePostLoadCPUUsage):
(WebCore::PerformanceMonitor::measurePostLoadMemoryUsage):
(WebCore::reportPageOverPostLoadCPUUsageThreshold): Deleted.</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="#trunkSourceWebCorepagePerformanceMonitorcpp">trunk/Source/WebCore/page/PerformanceMonitor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212960 => 212961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-24 17:50:06 UTC (rev 212960)
+++ trunk/Source/WebCore/ChangeLog 2017-02-24 19:24:21 UTC (rev 212961)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-02-24 Chris Dumez <cdumez@apple.com>
+
+ [Mac] Report domains using abnormally high memory usage via enhanced privacy logging
+ https://bugs.webkit.org/show_bug.cgi?id=168797
+ <rdar://problem/29964017>
+
+ Reviewed by Andreas Kling.
+
+ Report domains using abnormally high memory usage (> 2GB) via enhanced privacy
+ logging on Mac.
+
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::domainCausingJetsamKey):
+ * page/DiagnosticLoggingKeys.h:
+ * page/PerformanceMonitor.cpp:
+ (WebCore::reportPageOverPostLoadResourceThreshold):
+ (WebCore::PerformanceMonitor::measurePostLoadCPUUsage):
+ (WebCore::PerformanceMonitor::measurePostLoadMemoryUsage):
+ (WebCore::reportPageOverPostLoadCPUUsageThreshold): Deleted.
+
</ins><span class="cx"> 2017-02-24 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> .. should not remove windows drive letters in paths of file URLs
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (212960 => 212961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-02-24 17:50:06 UTC (rev 212960)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-02-24 19:24:21 UTC (rev 212961)
</span><span class="lines">@@ -348,6 +348,11 @@
</span><span class="cx"> return ASCIILiteral("DomainCausingEnergyDrain");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::domainCausingJetsamKey()
+{
+ return ASCIILiteral("DomainCausingJetsam");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::domainVisitedKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("DomainVisited");
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (212960 => 212961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-02-24 17:50:06 UTC (rev 212960)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-02-24 19:24:21 UTC (rev 212961)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> static String diskCacheAfterValidationKey();
</span><span class="cx"> static String documentLoaderStoppingKey();
</span><span class="cx"> static String domainCausingEnergyDrainKey();
</span><ins>+ static String domainCausingJetsamKey();
</ins><span class="cx"> static String domainVisitedKey();
</span><span class="cx"> static String engineFailedToLoadKey();
</span><span class="cx"> WEBCORE_EXPORT static String entryRightlyNotWarmedUpKey();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceMonitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceMonitor.cpp (212960 => 212961)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceMonitor.cpp 2017-02-24 17:50:06 UTC (rev 212960)
+++ trunk/Source/WebCore/page/PerformanceMonitor.cpp 2017-02-24 19:24:21 UTC (rev 212961)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> static const std::chrono::seconds memoryUsageMeasurementDelay { 10 };
</span><span class="cx">
</span><span class="cx"> static const double postPageLoadCPUUsageDomainReportingThreshold { 20.0 }; // Reporting pages using over 20% CPU is roughly equivalent to reporting the 10% worst pages.
</span><ins>+#if !PLATFORM(IOS)
+static const uint64_t postPageLoadMemoryUsageDomainReportingThreshold { 2048 * MB };
+#endif
</ins><span class="cx">
</span><span class="cx"> static inline ActivityStateForCPUSampling activityStateForCPUSampling(ActivityState::Flags state)
</span><span class="cx"> {
</span><span class="lines">@@ -126,7 +129,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void reportPageOverPostLoadCPUUsageThreshold(Page& page)
</del><ins>+enum class ReportingReason { HighCPUUsage, HighMemoryUsage };
+static void reportPageOverPostLoadResourceThreshold(Page& page, ReportingReason reason)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(PUBLIC_SUFFIX_LIST)
</span><span class="cx"> auto* document = page.mainFrame().document();
</span><span class="lines">@@ -137,9 +141,17 @@
</span><span class="cx"> if (domain.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- page.diagnosticLoggingClient().logDiagnosticMessageWithEnhancedPrivacy(DiagnosticLoggingKeys::domainCausingEnergyDrainKey(), domain, ShouldSample::No);
</del><ins>+ switch (reason) {
+ case ReportingReason::HighCPUUsage:
+ page.diagnosticLoggingClient().logDiagnosticMessageWithEnhancedPrivacy(DiagnosticLoggingKeys::domainCausingEnergyDrainKey(), domain, ShouldSample::No);
+ break;
+ case ReportingReason::HighMemoryUsage:
+ page.diagnosticLoggingClient().logDiagnosticMessageWithEnhancedPrivacy(DiagnosticLoggingKeys::domainCausingJetsamKey(), domain, ShouldSample::No);
+ break;
+ }
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(page);
</span><ins>+ UNUSED_PARAM(reason);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -165,7 +177,7 @@
</span><span class="cx"> m_page.diagnosticLoggingClient().logDiagnosticMessage(DiagnosticLoggingKeys::postPageLoadCPUUsageKey(), DiagnosticLoggingKeys::foregroundCPUUsageToDiagnosticLoggingKey(cpuUsage), ShouldSample::No);
</span><span class="cx">
</span><span class="cx"> if (cpuUsage > postPageLoadCPUUsageDomainReportingThreshold)
</span><del>- reportPageOverPostLoadCPUUsageThreshold(m_page);
</del><ins>+ reportPageOverPostLoadResourceThreshold(m_page, ReportingReason::HighCPUUsage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PerformanceMonitor::measurePostLoadMemoryUsage()
</span><span class="lines">@@ -179,6 +191,12 @@
</span><span class="cx">
</span><span class="cx"> RELEASE_LOG_IF_ALLOWED(PerformanceLogging, "measurePostLoadMemoryUsage: Process was using %llu bytes of memory after the page load.", memoryUsage.value());
</span><span class="cx"> m_page.diagnosticLoggingClient().logDiagnosticMessage(DiagnosticLoggingKeys::postPageLoadMemoryUsageKey(), DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey(memoryUsage.value()), ShouldSample::No);
</span><ins>+
+ // On iOS, we report actual Jetsams instead.
+#if !PLATFORM(IOS)
+ if (memoryUsage.value() > postPageLoadMemoryUsageDomainReportingThreshold)
+ reportPageOverPostLoadResourceThreshold(m_page, ReportingReason::HighMemoryUsage);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PerformanceMonitor::measurePostBackgroundingMemoryUsage()
</span></span></pre>
</div>
</div>
</body>
</html>