<!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>[211233] 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/211233">211233</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2017-01-26 15:33:14 -0800 (Thu, 26 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix CPU / Memory diagnostic logging in PerformanceMonitor
https://bugs.webkit.org/show_bug.cgi?id=167469
<rdar://problem/30220959>
Reviewed by Alex Christensen.
Fix CPU / Memory diagnostic logging in PerformanceMonitor to use logDiagnosticMessage()
instead of logDiagnosticMessageWithValue(). logDiagnosticMessageWithValue() should only
be used with numeric values but we already take care of the bucketing on our side.
* page/DiagnosticLoggingClient.h:
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::postPageBackgroundingCPUUsageKey):
(WebCore::DiagnosticLoggingKeys::postPageBackgroundingMemoryUsageKey):
(WebCore::DiagnosticLoggingKeys::postPageLoadCPUUsageKey):
(WebCore::DiagnosticLoggingKeys::postPageLoadMemoryUsageKey):
(WebCore::DiagnosticLoggingKeys::foregroundCPUUsageToDiagnosticLoggingKey):
(WebCore::DiagnosticLoggingKeys::backgroundCPUUsageToDiagnosticLoggingKey):
(WebCore::DiagnosticLoggingKeys::postPageBackgroundingKey): Deleted.
(WebCore::DiagnosticLoggingKeys::postPageLoadKey): Deleted.
(WebCore::DiagnosticLoggingKeys::memoryUsageKey): Deleted.
* page/DiagnosticLoggingKeys.h:
* page/PerformanceMonitor.cpp:
(WebCore::PerformanceMonitor::measurePostLoadCPUUsage):
(WebCore::PerformanceMonitor::measurePostLoadMemoryUsage):
(WebCore::PerformanceMonitor::measurePostBackgroundingMemoryUsage):
(WebCore::PerformanceMonitor::measurePostBackgroundingCPUUsage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingClienth">trunk/Source/WebCore/page/DiagnosticLoggingClient.h</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 (211232 => 211233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-26 22:34:00 UTC (rev 211232)
+++ trunk/Source/WebCore/ChangeLog 2017-01-26 23:33:14 UTC (rev 211233)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2017-01-26 Chris Dumez <cdumez@apple.com>
+
+ Fix CPU / Memory diagnostic logging in PerformanceMonitor
+ https://bugs.webkit.org/show_bug.cgi?id=167469
+ <rdar://problem/30220959>
+
+ Reviewed by Alex Christensen.
+
+ Fix CPU / Memory diagnostic logging in PerformanceMonitor to use logDiagnosticMessage()
+ instead of logDiagnosticMessageWithValue(). logDiagnosticMessageWithValue() should only
+ be used with numeric values but we already take care of the bucketing on our side.
+
+ * page/DiagnosticLoggingClient.h:
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::postPageBackgroundingCPUUsageKey):
+ (WebCore::DiagnosticLoggingKeys::postPageBackgroundingMemoryUsageKey):
+ (WebCore::DiagnosticLoggingKeys::postPageLoadCPUUsageKey):
+ (WebCore::DiagnosticLoggingKeys::postPageLoadMemoryUsageKey):
+ (WebCore::DiagnosticLoggingKeys::foregroundCPUUsageToDiagnosticLoggingKey):
+ (WebCore::DiagnosticLoggingKeys::backgroundCPUUsageToDiagnosticLoggingKey):
+ (WebCore::DiagnosticLoggingKeys::postPageBackgroundingKey): Deleted.
+ (WebCore::DiagnosticLoggingKeys::postPageLoadKey): Deleted.
+ (WebCore::DiagnosticLoggingKeys::memoryUsageKey): Deleted.
+ * page/DiagnosticLoggingKeys.h:
+ * page/PerformanceMonitor.cpp:
+ (WebCore::PerformanceMonitor::measurePostLoadCPUUsage):
+ (WebCore::PerformanceMonitor::measurePostLoadMemoryUsage):
+ (WebCore::PerformanceMonitor::measurePostBackgroundingMemoryUsage):
+ (WebCore::PerformanceMonitor::measurePostBackgroundingCPUUsage):
+
</ins><span class="cx"> 2017-01-26 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Gamepads: Some DPads are still not exposed in the HID backend.
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingClient.h (211232 => 211233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingClient.h 2017-01-26 22:34:00 UTC (rev 211232)
+++ trunk/Source/WebCore/page/DiagnosticLoggingClient.h 2017-01-26 23:33:14 UTC (rev 211233)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual void logDiagnosticMessage(const String& message, const String& description, ShouldSample) = 0;
</span><span class="cx"> virtual void logDiagnosticMessageWithResult(const String& message, const String& description, DiagnosticLoggingResultType, ShouldSample) = 0;
</span><ins>+ // FIXME: rename this to logDiagnosticMessageWithNumericValue().
</ins><span class="cx"> virtual void logDiagnosticMessageWithValue(const String& message, const String& description, const String& value, ShouldSample) = 0;
</span><span class="cx">
</span><span class="cx"> static bool shouldLogAfterSampling(ShouldSample);
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (211232 => 211233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-01-26 22:34:00 UTC (rev 211232)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2017-01-26 23:33:14 UTC (rev 211233)
</span><span class="lines">@@ -53,21 +53,31 @@
</span><span class="cx"> return ASCIILiteral("pluginFailedLoading");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::postPageBackgroundingKey()
</del><ins>+String DiagnosticLoggingKeys::postPageBackgroundingCPUUsageKey()
</ins><span class="cx"> {
</span><del>- return ASCIILiteral("postPageBackgrounding");
</del><ins>+ return ASCIILiteral("postPageBackgroundingCPUUsage");
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::postPageBackgroundingMemoryUsageKey()
+{
+ return ASCIILiteral("postPageBackgroundingMemoryUsage");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::pageHandlesWebGLContextLossKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("pageHandlesWebGLContextLoss");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::postPageLoadKey()
</del><ins>+String DiagnosticLoggingKeys::postPageLoadCPUUsageKey()
</ins><span class="cx"> {
</span><del>- return ASCIILiteral("postPageLoad");
</del><ins>+ return ASCIILiteral("postPageLoadCPUUsage");
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::postPageLoadMemoryUsageKey()
+{
+ return ASCIILiteral("postPageLoadMemoryUsage");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::provisionalLoadKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("provisionalLoad");
</span><span class="lines">@@ -338,11 +348,6 @@
</span><span class="cx"> return ASCIILiteral("cpuUsage");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String DiagnosticLoggingKeys::memoryUsageKey()
-{
- return ASCIILiteral("memoryUsage");
-}
-
</del><span class="cx"> String DiagnosticLoggingKeys::createSharedBufferFailedKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("createSharedBufferFailed");
</span><span class="lines">@@ -718,7 +723,7 @@
</span><span class="cx"> String DiagnosticLoggingKeys::foregroundCPUUsageToDiagnosticLoggingKey(double cpuUsage)
</span><span class="cx"> {
</span><span class="cx"> if (cpuUsage < 10)
</span><del>- return ASCIILiteral("Below10");
</del><ins>+ return ASCIILiteral("below10");
</ins><span class="cx"> if (cpuUsage < 20)
</span><span class="cx"> return ASCIILiteral("10to20");
</span><span class="cx"> if (cpuUsage < 40)
</span><span class="lines">@@ -733,7 +738,7 @@
</span><span class="cx"> String DiagnosticLoggingKeys::backgroundCPUUsageToDiagnosticLoggingKey(double cpuUsage)
</span><span class="cx"> {
</span><span class="cx"> if (cpuUsage < 1)
</span><del>- return ASCIILiteral("Below1");
</del><ins>+ return ASCIILiteral("below1");
</ins><span class="cx"> if (cpuUsage < 5)
</span><span class="cx"> return ASCIILiteral("1to5");
</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 (211232 => 211233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-01-26 22:34:00 UTC (rev 211232)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2017-01-26 23:33:14 UTC (rev 211233)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> static String canCacheKey();
</span><span class="cx"> static String cannotSuspendActiveDOMObjectsKey();
</span><span class="cx"> WEBCORE_EXPORT static String cpuUsageKey();
</span><del>- WEBCORE_EXPORT static String memoryUsageKey();
</del><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">@@ -105,8 +104,10 @@
</span><span class="cx"> static String playedKey();
</span><span class="cx"> static String pluginLoadedKey();
</span><span class="cx"> static String pluginLoadingFailedKey();
</span><del>- static String postPageBackgroundingKey();
- static String postPageLoadKey();
</del><ins>+ static String postPageBackgroundingCPUUsageKey();
+ static String postPageBackgroundingMemoryUsageKey();
+ static String postPageLoadCPUUsageKey();
+ static String postPageLoadMemoryUsageKey();
</ins><span class="cx"> static String provisionalLoadKey();
</span><span class="cx"> static String prunedDueToMaxSizeReached();
</span><span class="cx"> static String prunedDueToMemoryPressureKey();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePerformanceMonitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PerformanceMonitor.cpp (211232 => 211233)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PerformanceMonitor.cpp 2017-01-26 22:34:00 UTC (rev 211232)
+++ trunk/Source/WebCore/page/PerformanceMonitor.cpp 2017-01-26 23:33:14 UTC (rev 211233)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> double cpuUsage = cpuTime.value().percentageCPUUsageSince(*m_postLoadCPUTime);
</span><span class="cx"> RELEASE_LOG_IF_ALLOWED(PerformanceLogging, "measurePostLoadCPUUsage: Process was using %.1f%% CPU after the page load.", cpuUsage);
</span><del>- m_page.diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::postPageLoadKey(), DiagnosticLoggingKeys::cpuUsageKey(), DiagnosticLoggingKeys::foregroundCPUUsageToDiagnosticLoggingKey(cpuUsage), ShouldSample::No);
</del><ins>+ m_page.diagnosticLoggingClient().logDiagnosticMessage(DiagnosticLoggingKeys::postPageLoadCPUUsageKey(), DiagnosticLoggingKeys::foregroundCPUUsageToDiagnosticLoggingKey(cpuUsage), ShouldSample::No);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PerformanceMonitor::measurePostLoadMemoryUsage()
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> return;
</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><del>- m_page.diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::postPageLoadKey(), DiagnosticLoggingKeys::memoryUsageKey(), DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey(memoryUsage.value()), ShouldSample::No);
</del><ins>+ m_page.diagnosticLoggingClient().logDiagnosticMessage(DiagnosticLoggingKeys::postPageLoadMemoryUsageKey(), DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey(memoryUsage.value()), ShouldSample::No);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PerformanceMonitor::measurePostBackgroundingMemoryUsage()
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> RELEASE_LOG_IF_ALLOWED(PerformanceLogging, "measurePostBackgroundingMemoryUsage: Process was using %llu bytes of memory after becoming non visible.", memoryUsage.value());
</span><del>- m_page.diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::postPageBackgroundingKey(), DiagnosticLoggingKeys::memoryUsageKey(), DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey(memoryUsage.value()), ShouldSample::No);
</del><ins>+ m_page.diagnosticLoggingClient().logDiagnosticMessage(DiagnosticLoggingKeys::postPageBackgroundingMemoryUsageKey(), DiagnosticLoggingKeys::memoryUsageToDiagnosticLoggingKey(memoryUsage.value()), ShouldSample::No);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PerformanceMonitor::measurePostBackgroundingCPUUsage()
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> double cpuUsage = cpuTime.value().percentageCPUUsageSince(*m_postBackgroundingCPUTime);
</span><span class="cx"> RELEASE_LOG_IF_ALLOWED(PerformanceLogging, "measurePostBackgroundingCPUUsage: Process was using %.1f%% CPU after becoming non visible.", cpuUsage);
</span><del>- m_page.diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::postPageBackgroundingKey(), DiagnosticLoggingKeys::cpuUsageKey(), DiagnosticLoggingKeys::backgroundCPUUsageToDiagnosticLoggingKey(cpuUsage), ShouldSample::No);
</del><ins>+ m_page.diagnosticLoggingClient().logDiagnosticMessage(DiagnosticLoggingKeys::postPageBackgroundingCPUUsageKey(), DiagnosticLoggingKeys::backgroundCPUUsageToDiagnosticLoggingKey(cpuUsage), ShouldSample::No);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PerformanceMonitor::measurePerActivityStateCPUUsage()
</span></span></pre>
</div>
</div>
</body>
</html>