<!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>[187303] branches/safari-601.1-branch/Source</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/187303">187303</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-07-23 23:56:46 -0700 (Thu, 23 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/187129">r187129</a>. rdar://problem/18477459</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWTFChangeLog">branches/safari-601.1-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWTFwtfRefCounterh">branches/safari-601.1-branch/Source/WTF/wtf/RefCounter.h</a></li>
<li><a href="#branchessafari6011branchSourceWebKit2ChangeLog">branches/safari-601.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebKit2UIProcessWebProcessPoolcpp">branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebKit2UIProcessWebProcessPoolh">branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#branchessafari6011branchSourceWebKit2UIProcessWebProcessProxycpp">branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebKit2UIProcessWebProcessProxyh">branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WTF/ChangeLog (187302 => 187303)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WTF/ChangeLog 2015-07-24 06:34:44 UTC (rev 187302)
+++ branches/safari-601.1-branch/Source/WTF/ChangeLog 2015-07-24 06:56:46 UTC (rev 187303)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-07-23 Lucas Forschler <lforschler@apple.com>
+
+ Merge r187129
+
+ 2015-07-21 Daniel Bates <dabates@apple.com>
+
+ WTFCrash() in WebKit::WebProcess::networkConnection()
+ https://bugs.webkit.org/show_bug.cgi?id=147112
+ <rdar://problem/18477459>
+
+ Reviewed by Gavin Barraclough.
+
+ Add explicit boolean conversion function and remove overload of operator! to support
+ checking whether an activity token is valid more directly than using the overloaded operator!.
+
+ * wtf/RefCounter.h:
+ (WTF::RefCounter::Token::operator bool): Added.
+ (WTF::RefCounter::Token::operator!): Deleted.
+
</ins><span class="cx"> 2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r186910. rdar://problem/21863296
</span></span></pre></div>
<a id="branchessafari6011branchSourceWTFwtfRefCounterh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WTF/wtf/RefCounter.h (187302 => 187303)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WTF/wtf/RefCounter.h 2015-07-24 06:34:44 UTC (rev 187302)
+++ branches/safari-601.1-branch/Source/WTF/wtf/RefCounter.h 2015-07-24 06:56:46 UTC (rev 187303)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> inline Token<T>& operator=(const Token<T>&);
</span><span class="cx"> inline Token<T>& operator=(Token<T>&&);
</span><span class="cx">
</span><del>- bool operator!() const { return !m_ptr; }
</del><ins>+ explicit operator bool() const { return m_ptr; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class RefCounter;
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187302 => 187303)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 06:34:44 UTC (rev 187302)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-24 06:56:46 UTC (rev 187303)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2015-07-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187129
+
+ 2015-07-21 Daniel Bates <dabates@apple.com>
+
+ WTFCrash() in WebKit::WebProcess::networkConnection()
+ https://bugs.webkit.org/show_bug.cgi?id=147112
+ <rdar://problem/18477459>
+
+ Reviewed by Gavin Barraclough.
+
+ Fixes an issue where a newly launched network process may be jetsam'd because it has not
+ taken a process assertion between the time it was launched and the time when a web process
+ makes use of it.
+
+ Initially a network process does not have a process assertion. A process assertion is taken
+ (if one has not been taken) for the network process when a process assertion is taken for at
+ least one web process. When the network process crashes a WebProcess may ultimately launch a
+ new network process in WebProcess::networkConnection(). The new network process may be jetsam'd
+ immediately when the system is under some measure pressure because it has a low jetsam priority,
+ 0 (since it does not have a process assertion and higher priority implies that a process is less
+ likely to be jetsam'd). And the logic in WebProcess::networkConnection() explicitly calls
+ CRASH() if the newly launched network process crashes immediately. Towards preventing the newly
+ launched network process from being jetsam'd we should obtain a process assertion for it.
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::WebProcessPool): Initialize m_didNetworkProcessCrash to false.
+ (WebKit::WebProcessPool::ensureNetworkProcess): If the network process crashed (m_didNetworkProcessCrash == true)
+ then tell each process in the pool to reinstate their network activity token for the new network process.
+ (WebKit::WebProcessPool::networkProcessCrashed): Set m_didNetworkProcessCrash to true when the
+ network process crashed.
+ * UIProcess/WebProcessPool.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::reinstateNetworkProcessAssertionState): Added.
+ (WebKit::WebProcessProxy::didSetAssertionState): Add assert to ensure we never have both
+ a background- and foreground- activity token for the network process.
+ * UIProcess/WebProcessProxy.h:
+
+2015-07-23 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r187117
</span><span class="cx">
</span><span class="cx"> 2015-07-21 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp (187302 => 187303)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-07-24 06:34:44 UTC (rev 187302)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-07-24 06:56:46 UTC (rev 187303)
</span><span class="lines">@@ -160,6 +160,7 @@
</span><span class="cx"> , m_processTerminationEnabled(true)
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> , m_canHandleHTTPSServerTrustEvaluation(true)
</span><ins>+ , m_didNetworkProcessCrash(false)
</ins><span class="cx"> #endif
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> , m_ignoreTLSErrors(true)
</span><span class="lines">@@ -419,6 +420,12 @@
</span><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::SetQOS(networkProcessLatencyQOS(), networkProcessThroughputQOS()), 0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (m_didNetworkProcessCrash) {
+ m_didNetworkProcessCrash = false;
+ for (auto& process : m_processes)
+ process->reinstateNetworkProcessAssertionState(*m_networkProcess);
+ }
+
</ins><span class="cx"> return *m_networkProcess;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -426,6 +433,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_networkProcess);
</span><span class="cx"> ASSERT(networkProcessProxy == m_networkProcess.get());
</span><ins>+ m_didNetworkProcessCrash = true;
</ins><span class="cx">
</span><span class="cx"> WebContextSupplementMap::const_iterator it = m_supplements.begin();
</span><span class="cx"> WebContextSupplementMap::const_iterator end = m_supplements.end();
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessPool.h (187302 => 187303)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessPool.h 2015-07-24 06:34:44 UTC (rev 187302)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessPool.h 2015-07-24 06:56:46 UTC (rev 187303)
</span><span class="lines">@@ -498,6 +498,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="cx"> bool m_canHandleHTTPSServerTrustEvaluation;
</span><ins>+ bool m_didNetworkProcessCrash;
</ins><span class="cx"> RefPtr<NetworkProcessProxy> m_networkProcess;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp (187302 => 187303)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-07-24 06:34:44 UTC (rev 187302)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-07-24 06:56:46 UTC (rev 187303)
</span><span class="lines">@@ -925,9 +925,24 @@
</span><span class="cx"> m_throttler.didCancelProcessSuspension();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+void WebProcessProxy::reinstateNetworkProcessAssertionState(NetworkProcessProxy& newNetworkProcessProxy)
+{
+ ASSERT(!m_backgroundTokenForNetworkProcess || !m_foregroundTokenForNetworkProcess);
+
+ // The network process crashed; take new tokens for the new network process.
+ if (m_backgroundTokenForNetworkProcess)
+ m_backgroundTokenForNetworkProcess = newNetworkProcessProxy.throttler().backgroundActivityToken();
+ else if (m_foregroundTokenForNetworkProcess)
+ m_foregroundTokenForNetworkProcess = newNetworkProcessProxy.throttler().foregroundActivityToken();
+}
+#endif
+
</ins><span class="cx"> void WebProcessProxy::didSetAssertionState(AssertionState state)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
</span><ins>+ ASSERT(!m_backgroundTokenForNetworkProcess || !m_foregroundTokenForNetworkProcess);
+
</ins><span class="cx"> switch (state) {
</span><span class="cx"> case AssertionState::Suspended:
</span><span class="cx"> m_foregroundTokenForNetworkProcess = nullptr;
</span><span class="lines">@@ -950,6 +965,8 @@
</span><span class="cx"> page->processWillBecomeForeground();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+
+ ASSERT(!m_backgroundTokenForNetworkProcess || !m_foregroundTokenForNetworkProcess);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(state);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessProxy.h (187302 => 187303)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-07-24 06:34:44 UTC (rev 187302)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-07-24 06:56:46 UTC (rev 187303)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class DownloadProxyMap;
</span><ins>+class NetworkProcessProxy;
</ins><span class="cx"> class WebBackForwardListItem;
</span><span class="cx"> class WebPageGroup;
</span><span class="cx"> class WebProcessPool;
</span><span class="lines">@@ -150,6 +151,10 @@
</span><span class="cx">
</span><span class="cx"> ProcessThrottler& throttler() { return m_throttler; }
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+ void reinstateNetworkProcessAssertionState(NetworkProcessProxy&);
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit WebProcessProxy(WebProcessPool&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>