<!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>[182194] trunk/Source/WebKit2</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/182194">182194</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-31 12:03:40 -0700 (Tue, 31 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][iOS] Extend ProcessThrottler use to the NetworkProcess
https://bugs.webkit.org/show_bug.cgi?id=143249
<rdar://problem/20231539>
Reviewed by Gavin Barraclough.
Extend ProcessThrottler use to the NetworkProcess instead of only the
WebProcesses. This is needed so that the NetworkProcess gets notified
before suspension. We now use this notification to free-up memory
before suspending by calling the critical memory pressure handler, as
we already do for WebProcesses (rdar://problem/20231539). In the
future, this infrastructure will be used to delay suspension until the
pending SQL transactions are done as well (rdar://problem/20180799).
Previously, the NetworkProcessProxy would hold a foreground assertion
on behalf of the NetworkProcess but would never release that assertion.
In this patch, we change this so that WebProcessProxies hold assertions
on behalf of the NetworkProcess, and release those assertions before
suspending. As a result, the NetworkProcess gets suspended when all
WebProcesses are suspended.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::processWillSuspend):
(WebKit::NetworkProcess::cancelProcessWillSuspend):
(WebKit::NetworkProcess::processDidResume):
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::NetworkProcessProxy):
(WebKit::NetworkProcessProxy::didFinishLaunching):
(WebKit::NetworkProcessProxy::sendProcessWillSuspend):
(WebKit::NetworkProcessProxy::sendCancelProcessWillSuspend):
(WebKit::NetworkProcessProxy::didCancelProcessSuspension):
(WebKit::NetworkProcessProxy::sendProcessDidResume):
(WebKit::NetworkProcessProxy::processReadyToSuspend):
* UIProcess/Network/NetworkProcessProxy.h:
(WebKit::NetworkProcessProxy::throttler):
* UIProcess/Network/NetworkProcessProxy.messages.in:
* UIProcess/ProcessThrottler.cpp:
(WebKit::ProcessThrottler::ProcessThrottler):
(WebKit::ProcessThrottler::didConnectToProcess):
(WebKit::ProcessThrottler::didConnnectToProcess): Deleted.
* UIProcess/ProcessThrottler.h:
* UIProcess/ProcessThrottlerClient.h: Added.
(WebKit::ProcessThrottlerClient::~ProcessThrottlerClient):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::ensureNetworkProcess):
* UIProcess/WebProcessPool.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::didFinishLaunching):
(WebKit::WebProcessProxy::initializeNetworkProcessActivityToken):
(WebKit::WebProcessProxy::sendProcessDidResume):
(WebKit::WebProcessProxy::processReadyToSuspend):
* UIProcess/WebProcessProxy.h:
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlercpp">trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlerh">trunk/Source/WebKit2/UIProcess/ProcessThrottler.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessProcessThrottlerClienth">trunk/Source/WebKit2/UIProcess/ProcessThrottlerClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -1,3 +1,61 @@
</span><ins>+2015-03-31 Chris Dumez <cdumez@apple.com>
+
+ [WK2][iOS] Extend ProcessThrottler use to the NetworkProcess
+ https://bugs.webkit.org/show_bug.cgi?id=143249
+ <rdar://problem/20231539>
+
+ Reviewed by Gavin Barraclough.
+
+ Extend ProcessThrottler use to the NetworkProcess instead of only the
+ WebProcesses. This is needed so that the NetworkProcess gets notified
+ before suspension. We now use this notification to free-up memory
+ before suspending by calling the critical memory pressure handler, as
+ we already do for WebProcesses (rdar://problem/20231539). In the
+ future, this infrastructure will be used to delay suspension until the
+ pending SQL transactions are done as well (rdar://problem/20180799).
+
+ Previously, the NetworkProcessProxy would hold a foreground assertion
+ on behalf of the NetworkProcess but would never release that assertion.
+ In this patch, we change this so that WebProcessProxies hold assertions
+ on behalf of the NetworkProcess, and release those assertions before
+ suspending. As a result, the NetworkProcess gets suspended when all
+ WebProcesses are suspended.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::processWillSuspend):
+ (WebKit::NetworkProcess::cancelProcessWillSuspend):
+ (WebKit::NetworkProcess::processDidResume):
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::NetworkProcessProxy):
+ (WebKit::NetworkProcessProxy::didFinishLaunching):
+ (WebKit::NetworkProcessProxy::sendProcessWillSuspend):
+ (WebKit::NetworkProcessProxy::sendCancelProcessWillSuspend):
+ (WebKit::NetworkProcessProxy::didCancelProcessSuspension):
+ (WebKit::NetworkProcessProxy::sendProcessDidResume):
+ (WebKit::NetworkProcessProxy::processReadyToSuspend):
+ * UIProcess/Network/NetworkProcessProxy.h:
+ (WebKit::NetworkProcessProxy::throttler):
+ * UIProcess/Network/NetworkProcessProxy.messages.in:
+ * UIProcess/ProcessThrottler.cpp:
+ (WebKit::ProcessThrottler::ProcessThrottler):
+ (WebKit::ProcessThrottler::didConnectToProcess):
+ (WebKit::ProcessThrottler::didConnnectToProcess): Deleted.
+ * UIProcess/ProcessThrottler.h:
+ * UIProcess/ProcessThrottlerClient.h: Added.
+ (WebKit::ProcessThrottlerClient::~ProcessThrottlerClient):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::ensureNetworkProcess):
+ * UIProcess/WebProcessPool.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::didFinishLaunching):
+ (WebKit::WebProcessProxy::initializeNetworkProcessActivityToken):
+ (WebKit::WebProcessProxy::sendProcessDidResume):
+ (WebKit::WebProcessProxy::processReadyToSuspend):
+ * UIProcess/WebProcessProxy.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-03-31 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, revert accidental change by r182138.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -501,6 +501,21 @@
</span><span class="cx"> ChildProcess::terminate();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcess::processWillSuspend()
+{
+ MemoryPressureHandler::singleton().releaseMemory(true);
+ parentProcessConnection()->send(Messages::NetworkProcessProxy::ProcessReadyToSuspend(), 0);
+}
+
+void NetworkProcess::cancelProcessWillSuspend()
+{
+ parentProcessConnection()->send(Messages::NetworkProcessProxy::DidCancelProcessSuspension(), 0);
+}
+
+void NetworkProcess::processDidResume()
+{
+}
+
</ins><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="cx"> void NetworkProcess::initializeProcess(const ChildProcessInitializationParameters&)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -77,6 +77,10 @@
</span><span class="cx"> DownloadManager& downloadManager();
</span><span class="cx"> bool canHandleHTTPSServerTrustEvaluation() const { return m_canHandleHTTPSServerTrustEvaluation; }
</span><span class="cx">
</span><ins>+ void processWillSuspend();
+ void cancelProcessWillSuspend();
+ void processDidResume();
+
</ins><span class="cx"> // Diagnostic messages logging.
</span><span class="cx"> void logDiagnosticMessage(uint64_t webPageID, const String& message, const String& description, WebCore::ShouldSample);
</span><span class="cx"> void logDiagnosticMessageWithResult(uint64_t webPageID, const String& message, const String& description, WebCore::DiagnosticLoggingResultType, WebCore::ShouldSample);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -57,6 +57,10 @@
</span><span class="cx">
</span><span class="cx"> ClearCacheForAllOrigins(uint32_t cachesToClear)
</span><span class="cx"> SetCacheModel(uint32_t cacheModel);
</span><ins>+
+ ProcessWillSuspend()
+ CancelProcessWillSuspend()
+ ProcessDidResume()
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(NETWORK_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> : m_processPool(processPool)
</span><span class="cx"> , m_numPendingConnectionRequests(0)
</span><span class="cx"> , m_customProtocolManagerProxy(this, processPool)
</span><ins>+ , m_throttler(std::make_unique<ProcessThrottler>(this))
</ins><span class="cx"> {
</span><span class="cx"> connect();
</span><span class="cx"> }
</span><span class="lines">@@ -273,7 +274,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (xpc_connection_t connection = this->connection()->xpcConnection())
</span><del>- m_assertion = std::make_unique<ProcessAssertion>(xpc_connection_get_pid(connection), AssertionState::Foreground);
</del><ins>+ m_throttler->didConnectToProcess(xpc_connection_get_pid(connection));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -310,6 +311,34 @@
</span><span class="cx"> page->logDiagnosticMessageWithValue(message, description, value, shouldSample);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcessProxy::sendProcessWillSuspend()
+{
+ if (canSendMessage())
+ send(Messages::NetworkProcess::ProcessWillSuspend(), 0);
+}
+
+void NetworkProcessProxy::sendCancelProcessWillSuspend()
+{
+ if (canSendMessage())
+ send(Messages::NetworkProcess::CancelProcessWillSuspend(), 0);
+}
+
+void NetworkProcessProxy::didCancelProcessSuspension()
+{
+ m_throttler->didCancelProcessSuspension();
+}
+
+void NetworkProcessProxy::sendProcessDidResume()
+{
+ if (canSendMessage())
+ send(Messages::NetworkProcess::ProcessDidResume(), 0);
+}
+
+void NetworkProcessProxy::processReadyToSuspend()
+{
+ m_throttler->processReadyToSuspend();
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(NETWORK_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -31,15 +31,13 @@
</span><span class="cx"> #include "ChildProcessProxy.h"
</span><span class="cx"> #include "CustomProtocolManagerProxy.h"
</span><span class="cx"> #include "ProcessLauncher.h"
</span><ins>+#include "ProcessThrottler.h"
+#include "ProcessThrottlerClient.h"
</ins><span class="cx"> #include "WebProcessProxyMessages.h"
</span><span class="cx"> #include "WebsiteDataTypes.h"
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-#include "ProcessAssertion.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> class AuthenticationChallenge;
</span><span class="cx"> class ResourceRequest;
</span><span class="lines">@@ -54,7 +52,7 @@
</span><span class="cx"> class WebProcessPool;
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx">
</span><del>-class NetworkProcessProxy : public ChildProcessProxy {
</del><ins>+class NetworkProcessProxy : public ChildProcessProxy, public ProcessThrottlerClient {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<NetworkProcessProxy> create(WebProcessPool&);
</span><span class="cx"> ~NetworkProcessProxy();
</span><span class="lines">@@ -71,6 +69,14 @@
</span><span class="cx"> void setProcessSuppressionEnabled(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void sendProcessWillSuspend() override;
+ void sendCancelProcessWillSuspend() override;
+ void didCancelProcessSuspension();
+ void processReadyToSuspend();
+ void sendProcessDidResume() override;
+
+ ProcessThrottler& throttler() { return *m_throttler; }
+
</ins><span class="cx"> private:
</span><span class="cx"> NetworkProcessProxy(WebProcessPool&);
</span><span class="cx">
</span><span class="lines">@@ -114,9 +120,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
</span><span class="cx"> CustomProtocolManagerProxy m_customProtocolManagerProxy;
</span><del>-#if PLATFORM(IOS)
- std::unique_ptr<ProcessAssertion> m_assertion;
-#endif
</del><ins>+ std::unique_ptr<ProcessThrottler> m_throttler;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -31,6 +31,9 @@
</span><span class="cx"> DidDeleteWebsiteData(uint64_t callbackID)
</span><span class="cx"> DidDeleteWebsiteDataForOrigins(uint64_t callbackID)
</span><span class="cx">
</span><ins>+ ProcessReadyToSuspend()
+ DidCancelProcessSuspension()
+
</ins><span class="cx"> # Diagnostic messages logging
</span><span class="cx"> LogDiagnosticMessage(uint64_t pageID, String message, String description, bool shouldSample)
</span><span class="cx"> LogDiagnosticMessageWithResult(uint64_t pageID, String message, String description, uint32_t result, bool shouldSample)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessThrottlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottler.cpp 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -26,13 +26,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ProcessThrottler.h"
</span><span class="cx">
</span><del>-#include "WebProcessProxy.h"
</del><ins>+#include "ProcessThrottlerClient.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static const unsigned processSuspensionTimeout = 30;
</span><span class="cx">
</span><del>-ProcessThrottler::ProcessThrottler(WebProcessProxy* process)
</del><ins>+ProcessThrottler::ProcessThrottler(ProcessThrottlerClient* process)
</ins><span class="cx"> : m_process(process)
</span><span class="cx"> , m_suspendTimer(RunLoop::main(), this, &ProcessThrottler::suspendTimerFired)
</span><span class="cx"> , m_foregroundCounter([this](bool) { updateAssertion(); })
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> updateAssertionNow();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ProcessThrottler::didConnnectToProcess(pid_t pid)
</del><ins>+void ProcessThrottler::didConnectToProcess(pid_t pid)
</ins><span class="cx"> {
</span><span class="cx"> m_suspendTimer.stop();
</span><span class="cx"> m_assertion = std::make_unique<ProcessAndUIAssertion>(pid, assertionState());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessThrottlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessThrottler.h (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottler.h 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottler.h 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> enum ProcessSuppressionDisabledTokenType { };
</span><span class="cx"> typedef RefCounter::Token<ProcessSuppressionDisabledTokenType> ProcessSuppressionDisabledToken;
</span><span class="cx">
</span><del>-class WebProcessProxy;
-
</del><ins>+class ProcessThrottlerClient;
+
</ins><span class="cx"> class ProcessThrottler {
</span><span class="cx"> public:
</span><span class="cx"> enum ForegroundActivityTokenType { };
</span><span class="lines">@@ -48,12 +48,12 @@
</span><span class="cx"> enum BackgroundActivityTokenType { };
</span><span class="cx"> typedef RefCounter::Token<BackgroundActivityTokenType> BackgroundActivityToken;
</span><span class="cx">
</span><del>- ProcessThrottler(WebProcessProxy*);
</del><ins>+ ProcessThrottler(ProcessThrottlerClient*);
</ins><span class="cx">
</span><span class="cx"> inline ForegroundActivityToken foregroundActivityToken() const;
</span><span class="cx"> inline BackgroundActivityToken backgroundActivityToken() const;
</span><span class="cx">
</span><del>- void didConnnectToProcess(pid_t);
</del><ins>+ void didConnectToProcess(pid_t);
</ins><span class="cx"> void processReadyToSuspend();
</span><span class="cx"> void didCancelProcessSuspension();
</span><span class="cx">
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> void updateAssertionNow();
</span><span class="cx"> void suspendTimerFired();
</span><span class="cx">
</span><del>- WebProcessProxy* m_process;
</del><ins>+ ProcessThrottlerClient* m_process;
</ins><span class="cx"> std::unique_ptr<ProcessAndUIAssertion> m_assertion;
</span><span class="cx"> RunLoop::Timer<ProcessThrottler> m_suspendTimer;
</span><span class="cx"> RefCounter m_foregroundCounter;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessThrottlerClienth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/ProcessThrottlerClient.h (0 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessThrottlerClient.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/ProcessThrottlerClient.h 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ProcessThrottlerClient_h
+#define ProcessThrottlerClient_h
+
+namespace WebKit {
+
+class ProcessThrottlerClient {
+public:
+ virtual ~ProcessThrottlerClient() { }
+
+ virtual void sendProcessWillSuspend() = 0;
+ virtual void sendCancelProcessWillSuspend() = 0;
+ virtual void sendProcessDidResume() = 0;
+};
+
+} // namespace WebKit
+
+#endif // ProcessThrottlerClient_h
+
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -392,10 +392,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><del>-void WebProcessPool::ensureNetworkProcess()
</del><ins>+NetworkProcessProxy& WebProcessPool::ensureNetworkProcess()
</ins><span class="cx"> {
</span><span class="cx"> if (m_networkProcess)
</span><del>- return;
</del><ins>+ return *m_networkProcess;
</ins><span class="cx">
</span><span class="cx"> m_networkProcess = NetworkProcessProxy::create(*this);
</span><span class="cx">
</span><span class="lines">@@ -437,6 +437,8 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::SetQOS(networkProcessLatencyQOS(), networkProcessThroughputQOS()), 0);
</span><span class="cx"> #endif
</span><ins>+
+ return *m_networkProcess;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::networkProcessCrashed(NetworkProcessProxy* networkProcessProxy)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> bool usesNetworkProcess() const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><del>- void ensureNetworkProcess();
</del><ins>+ NetworkProcessProxy& ensureNetworkProcess();
</ins><span class="cx"> NetworkProcessProxy* networkProcess() { return m_networkProcess.get(); }
</span><span class="cx"> void networkProcessCrashed(NetworkProcessProxy*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -535,8 +535,10 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> xpc_connection_t xpcConnection = connection()->xpcConnection();
</span><span class="cx"> ASSERT(xpcConnection);
</span><del>- m_throttler->didConnnectToProcess(xpc_connection_get_pid(xpcConnection));
</del><ins>+ m_throttler->didConnectToProcess(xpc_connection_get_pid(xpcConnection));
</ins><span class="cx"> #endif
</span><ins>+
+ initializeNetworkProcessActivityToken();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebFrameProxy* WebProcessProxy::webFrame(uint64_t frameID) const
</span><span class="lines">@@ -845,9 +847,19 @@
</span><span class="cx"> if (canSendMessage())
</span><span class="cx"> send(Messages::WebProcess::CancelProcessWillSuspend(), 0);
</span><span class="cx"> }
</span><del>-
</del><ins>+
+void WebProcessProxy::initializeNetworkProcessActivityToken()
+{
+#if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
+ if (processPool().usesNetworkProcess())
+ m_tokenForNetworkProcess = processPool().ensureNetworkProcess().throttler().foregroundActivityToken();
+#endif
+}
+
</ins><span class="cx"> void WebProcessProxy::sendProcessDidResume()
</span><span class="cx"> {
</span><ins>+ initializeNetworkProcessActivityToken();
+
</ins><span class="cx"> if (canSendMessage())
</span><span class="cx"> send(Messages::WebProcess::ProcessDidResume(), 0);
</span><span class="cx"> }
</span><span class="lines">@@ -855,6 +867,9 @@
</span><span class="cx"> void WebProcessProxy::processReadyToSuspend()
</span><span class="cx"> {
</span><span class="cx"> m_throttler->processReadyToSuspend();
</span><ins>+#if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
+ m_tokenForNetworkProcess = nullptr;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::didCancelProcessSuspension()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "PlatformProcessIdentifier.h"
</span><span class="cx"> #include "PluginInfoStore.h"
</span><span class="cx"> #include "ProcessLauncher.h"
</span><ins>+#include "ProcessThrottlerClient.h"
</ins><span class="cx"> #include "ResponsivenessTimer.h"
</span><span class="cx"> #include "WebConnectionToWebProcess.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="lines">@@ -63,7 +64,7 @@
</span><span class="cx"> class WebProcessPool;
</span><span class="cx"> struct WebNavigationDataStore;
</span><span class="cx">
</span><del>-class WebProcessProxy : public ChildProcessProxy, ResponsivenessTimer::Client {
</del><ins>+class WebProcessProxy : public ChildProcessProxy, ResponsivenessTimer::Client, public ProcessThrottlerClient {
</ins><span class="cx"> public:
</span><span class="cx"> typedef HashMap<uint64_t, RefPtr<WebBackForwardListItem>> WebBackForwardListItemMap;
</span><span class="cx"> typedef HashMap<uint64_t, RefPtr<WebFrameProxy>> WebFrameProxyMap;
</span><span class="lines">@@ -142,11 +143,11 @@
</span><span class="cx">
</span><span class="cx"> void windowServerConnectionStateChanged();
</span><span class="cx">
</span><del>- void sendProcessWillSuspend();
</del><ins>+ void sendProcessWillSuspend() override;
</ins><span class="cx"> void processReadyToSuspend();
</span><del>- void sendCancelProcessWillSuspend();
</del><ins>+ void sendCancelProcessWillSuspend() override;
</ins><span class="cx"> void didCancelProcessSuspension();
</span><del>- void sendProcessDidResume();
</del><ins>+ void sendProcessDidResume() override;
</ins><span class="cx">
</span><span class="cx"> void setIsHoldingLockedFiles(bool);
</span><span class="cx">
</span><span class="lines">@@ -212,6 +213,8 @@
</span><span class="cx">
</span><span class="cx"> bool canTerminateChildProcess();
</span><span class="cx">
</span><ins>+ void initializeNetworkProcessActivityToken();
+
</ins><span class="cx"> ResponsivenessTimer m_responsivenessTimer;
</span><span class="cx">
</span><span class="cx"> RefPtr<WebConnectionToWebProcess> m_webConnection;
</span><span class="lines">@@ -237,6 +240,9 @@
</span><span class="cx"> int m_numberOfTimesSuddenTerminationWasDisabled;
</span><span class="cx"> std::unique_ptr<ProcessThrottler> m_throttler;
</span><span class="cx"> ProcessThrottler::BackgroundActivityToken m_tokenForHoldingLockedFiles;
</span><ins>+#if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
+ ProcessThrottler::ForegroundActivityToken m_tokenForNetworkProcess;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (182193 => 182194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-03-31 19:01:59 UTC (rev 182193)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-03-31 19:03:40 UTC (rev 182194)
</span><span class="lines">@@ -1177,6 +1177,7 @@
</span><span class="cx"> 7CF47FFE17276AE3008ACB91 /* WKBundlePageBannerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CF47FFC17276AE3008ACB91 /* WKBundlePageBannerMac.mm */; };
</span><span class="cx"> 7CF47FFF17276AE3008ACB91 /* WKBundlePageBannerMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CF47FFD17276AE3008ACB91 /* WKBundlePageBannerMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7EC4F0FB18E4ACBB008056AF /* NetworkProcessCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7EC4F0F918E4A945008056AF /* NetworkProcessCocoa.mm */; };
</span><ins>+ 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83048AE51ACA45DC0082C832 /* ProcessThrottlerClient.h */; };
</ins><span class="cx"> 834B250F1A831A8D00CFB150 /* NetworkCacheFileSystemPosix.h in Headers */ = {isa = PBXBuildFile; fileRef = 834B250E1A831A8D00CFB150 /* NetworkCacheFileSystemPosix.h */; };
</span><span class="cx"> 834B25121A842C8700CFB150 /* NetworkCacheStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = 834B25101A842C8700CFB150 /* NetworkCacheStatistics.h */; };
</span><span class="cx"> 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB241A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -3387,6 +3388,7 @@
</span><span class="cx"> 7CF47FFC17276AE3008ACB91 /* WKBundlePageBannerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKBundlePageBannerMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 7CF47FFD17276AE3008ACB91 /* WKBundlePageBannerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageBannerMac.h; sourceTree = "<group>"; };
</span><span class="cx"> 7EC4F0F918E4A945008056AF /* NetworkProcessCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessCocoa.mm; path = NetworkProcess/cocoa/NetworkProcessCocoa.mm; sourceTree = "<group>"; };
</span><ins>+ 83048AE51ACA45DC0082C832 /* ProcessThrottlerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessThrottlerClient.h; sourceTree = "<group>"; };
</ins><span class="cx"> 834B250E1A831A8D00CFB150 /* NetworkCacheFileSystemPosix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheFileSystemPosix.h; sourceTree = "<group>"; };
</span><span class="cx"> 834B25101A842C8700CFB150 /* NetworkCacheStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheStatistics.h; sourceTree = "<group>"; };
</span><span class="cx"> 8372DB241A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageDiagnosticLoggingClient.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -6145,6 +6147,7 @@
</span><span class="cx"> BC597074116591D000551FCA /* ProcessModel.h */,
</span><span class="cx"> 86E67A22190F411800004AB7 /* ProcessThrottler.cpp */,
</span><span class="cx"> 86E67A21190F411800004AB7 /* ProcessThrottler.h */,
</span><ins>+ 83048AE51ACA45DC0082C832 /* ProcessThrottlerClient.h */,
</ins><span class="cx"> BC111B08112F5E3C00337BAB /* ResponsivenessTimer.cpp */,
</span><span class="cx"> 1A30066C1110F4F70031937C /* ResponsivenessTimer.h */,
</span><span class="cx"> 51A4D5A816CAC4FF000E615E /* StatisticsRequest.cpp */,
</span><span class="lines">@@ -7620,6 +7623,7 @@
</span><span class="cx"> BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */,
</span><span class="cx"> BC90A1D2122DD55E00CC8C50 /* APIURLResponse.h in Headers */,
</span><span class="cx"> F6113E25126CE1820057D0A7 /* APIUserContentURLPattern.h in Headers */,
</span><ins>+ 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */,
</ins><span class="cx"> C5E1AFED16B21017006CC1F2 /* APIWebArchive.h in Headers */,
</span><span class="cx"> C5E1AFEF16B21029006CC1F2 /* APIWebArchiveResource.h in Headers */,
</span><span class="cx"> 1A3635AA1A3144A300ED6197 /* APIWebsiteDataStore.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>