Title: [211271] branches/safari-603-branch/Source/WebKit2
- Revision
- 211271
- Author
- matthew_han...@apple.com
- Date
- 2017-01-27 00:02:23 -0800 (Fri, 27 Jan 2017)
Log Message
Merge r211239. rdar://problem/30221723
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211270 => 211271)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-27 08:02:21 UTC (rev 211270)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-27 08:02:23 UTC (rev 211271)
@@ -1,5 +1,24 @@
2017-01-26 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211239. rdar://problem/30221723
+
+ 2017-01-26 Chris Dumez <cdu...@apple.com>
+
+ Fix CPU usage diagnostic logging in PerActivityStateCPUUsageSampler
+ https://bugs.webkit.org/show_bug.cgi?id=167471
+ <rdar://problem/30221723>
+
+ Reviewed by Alex Christensen.
+
+ Fix CPU usage diagnostic logging in PerActivityStateCPUUsageSampler
+ to use numeric values for logDiagnosticMessageWithValue().
+
+ * UIProcess/PerActivityStateCPUUsageSampler.cpp:
+ (WebKit::PerActivityStateCPUUsageSampler::loggingTimerFired):
+ (WebKit::loggingKeyForCPUUsage): Deleted.
+
+2017-01-26 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211234. rdar://problem/29899862
2017-01-26 Jeremy Jones <jere...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/PerActivityStateCPUUsageSampler.cpp (211270 => 211271)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/PerActivityStateCPUUsageSampler.cpp 2017-01-27 08:02:21 UTC (rev 211270)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/PerActivityStateCPUUsageSampler.cpp 2017-01-27 08:02:23 UTC (rev 211271)
@@ -70,17 +70,6 @@
}
}
-static inline String loggingKeyForCPUUsage(ActivityStateForCPUSampling state, double cpuUsage)
-{
- switch (state) {
- case ActivityStateForCPUSampling::NonVisible:
- return DiagnosticLoggingKeys::backgroundCPUUsageToDiagnosticLoggingKey(cpuUsage);
- case ActivityStateForCPUSampling::VisibleNonActive:
- case ActivityStateForCPUSampling::VisibleAndActive:
- return DiagnosticLoggingKeys::foregroundCPUUsageToDiagnosticLoggingKey(cpuUsage);
- }
-}
-
void PerActivityStateCPUUsageSampler::loggingTimerFired()
{
auto* page = pageForLogging();
@@ -94,9 +83,9 @@
for (auto& pair : m_cpuTimeInActivityState) {
double cpuUsage = static_cast<double>(pair.value * 100.) / cpuTimeDelta;
- String loggingKey = loggingKeyForActivityState(pair.key);
- page->logDiagnosticMessageWithValue(DiagnosticLoggingKeys::cpuUsageKey(), loggingKey, loggingKeyForCPUUsage(pair.key, cpuUsage), false);
- RELEASE_LOG(PerformanceLogging, "WebContent processes used %.1f%% CPU in %s state", cpuUsage, loggingKey.utf8().data());
+ String activityStateKey = loggingKeyForActivityState(pair.key);
+ page->logDiagnosticMessageWithValue(DiagnosticLoggingKeys::cpuUsageKey(), activityStateKey, String::number(cpuUsage, 1), false);
+ RELEASE_LOG(PerformanceLogging, "WebContent processes used %.1f%% CPU in %s state", cpuUsage, activityStateKey.utf8().data());
}
m_cpuTimeInActivityState.clear();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
