Modified: trunk/Source/WebKit2/ChangeLog (218200 => 218201)
--- trunk/Source/WebKit2/ChangeLog 2017-06-13 20:37:31 UTC (rev 218200)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-13 20:58:15 UTC (rev 218201)
@@ -1,3 +1,17 @@
+2017-06-13 Chris Dumez <cdu...@apple.com>
+
+ Include PID in some UIProcess-side release logging that relates to a particular WebProcess
+ https://bugs.webkit.org/show_bug.cgi?id=173299
+
+ Reviewed by Ryosuke Niwa.
+
+ * UIProcess/BackgroundProcessResponsivenessTimer.cpp:
+ (WebKit::BackgroundProcessResponsivenessTimer::setResponsive):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::didExceedActiveMemoryLimit):
+ (WebKit::WebProcessProxy::didExceedInactiveMemoryLimit):
+ (WebKit::WebProcessProxy::didExceedCPULimit):
+
2017-06-13 Daniel Bates <daba...@apple.com>
Implement W3C Secure Contexts Draft Specification
Modified: trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.cpp (218200 => 218201)
--- trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.cpp 2017-06-13 20:37:31 UTC (rev 218200)
+++ trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.cpp 2017-06-13 20:58:15 UTC (rev 218201)
@@ -121,10 +121,10 @@
client().didChangeIsResponsive();
if (m_isResponsive) {
- RELEASE_LOG_ERROR(PerformanceLogging, "Notifying the client that a background WebProcess has become responsive again");
+ RELEASE_LOG_ERROR(PerformanceLogging, "Notifying the client that background WebProcess with pid %d has become responsive again", m_webProcessProxy.processIdentifier());
client().didBecomeResponsive();
} else {
- RELEASE_LOG_ERROR(PerformanceLogging, "Notifying the client that a background WebProcess has become unresponsive");
+ RELEASE_LOG_ERROR(PerformanceLogging, "Notifying the client that background WebProcess with pid %d has become unresponsive", m_webProcessProxy.processIdentifier());
client().didBecomeUnresponsive();
}
}
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (218200 => 218201)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-06-13 20:37:31 UTC (rev 218200)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2017-06-13 20:58:15 UTC (rev 218201)
@@ -1214,7 +1214,7 @@
void WebProcessProxy::didExceedActiveMemoryLimit()
{
- RELEASE_LOG_ERROR(PerformanceLogging, "%p - WebProcessProxy::didExceedActiveMemoryLimit() Terminating WebProcess that has exceeded the active memory limit", this);
+ RELEASE_LOG_ERROR(PerformanceLogging, "%p - WebProcessProxy::didExceedActiveMemoryLimit() Terminating WebProcess with pid %d that has exceeded the active memory limit", this, processIdentifier());
logDiagnosticMessageForResourceLimitTermination(DiagnosticLoggingKeys::exceededActiveMemoryLimitKey());
requestTermination(ProcessTerminationReason::ExceededMemoryLimit);
}
@@ -1221,7 +1221,7 @@
void WebProcessProxy::didExceedInactiveMemoryLimit()
{
- RELEASE_LOG_ERROR(PerformanceLogging, "%p - WebProcessProxy::didExceedInactiveMemoryLimit() Terminating WebProcess that has exceeded the inactive memory limit", this);
+ RELEASE_LOG_ERROR(PerformanceLogging, "%p - WebProcessProxy::didExceedInactiveMemoryLimit() Terminating WebProcess with pid %d that has exceeded the inactive memory limit", this, processIdentifier());
logDiagnosticMessageForResourceLimitTermination(DiagnosticLoggingKeys::exceededInactiveMemoryLimitKey());
requestTermination(ProcessTerminationReason::ExceededMemoryLimit);
}
@@ -1230,12 +1230,12 @@
{
for (auto& page : pages()) {
if (page->isPlayingAudio()) {
- RELEASE_LOG(PerformanceLogging, "%p - WebProcessProxy::didExceedCPULimit() WebProcess has exceeded the background CPU limit but we are not terminating it because there is audio playing", this);
+ RELEASE_LOG(PerformanceLogging, "%p - WebProcessProxy::didExceedCPULimit() WebProcess with pid %d has exceeded the background CPU limit but we are not terminating it because there is audio playing", this, processIdentifier());
return;
}
if (page->hasActiveAudioStream() || page->hasActiveVideoStream()) {
- RELEASE_LOG(PerformanceLogging, "%p - WebProcessProxy::didExceedCPULimit() WebProcess has exceeded the background CPU limit but we are not terminating it because it is capturing audio / video", this);
+ RELEASE_LOG(PerformanceLogging, "%p - WebProcessProxy::didExceedCPULimit() WebProcess with pid %d has exceeded the background CPU limit but we are not terminating it because it is capturing audio / video", this, processIdentifier());
return;
}
}
@@ -1252,7 +1252,7 @@
if (hasVisiblePage)
return;
- RELEASE_LOG_ERROR(PerformanceLogging, "%p - WebProcessProxy::didExceedCPULimit() Terminating background WebProcess that has exceeded the background CPU limit", this);
+ RELEASE_LOG_ERROR(PerformanceLogging, "%p - WebProcessProxy::didExceedCPULimit() Terminating background WebProcess with pid %d that has exceeded the background CPU limit", this, processIdentifier());
logDiagnosticMessageForResourceLimitTermination(DiagnosticLoggingKeys::exceededBackgroundCPULimitKey());
requestTermination(ProcessTerminationReason::ExceededCPULimit);
}
