<!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>[169389] 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/169389">169389</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-05-27 10:36:55 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add UI process watchdog on iOS to ensure WebProcess connections close
https://bugs.webkit.org/show_bug.cgi?id=133200
<rdar://problem/16997983>
Reviewed by Darin Adler.
When the WebProcessProxy wants to disconnect from a WebContent process it just drops the connection,
and hopes the connection closes. There is a watchdog thread in the ChildProcess to try to ensure this
happens.
On iOS the process may not be runnable at the time, preventing termination. Instead add a watchdog in
the UI process to make the process runnable, and to terminate if it doesn't quit in a timely fashion.
* Platform/IPC/Connection.h:
- added terminateSoon.
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::ConnectionTerminationWatchdog::ConnectionTerminationWatchdog):
- take an assertion to make the process runnable, and start a watchdog timer.
(IPC::ConnectionTerminationWatchdog::watchdogTimerFired):
- if the process hasn't quit by the timer the watchdog fires, kill it.
(IPC::Connection::terminateSoon):
- create a ConnectionTerminationWatchdog.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::removeWebPage):
- when disconnecting from a process, first tell it to terminateSoon.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169388 => 169389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-27 17:36:21 UTC (rev 169388)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-27 17:36:55 UTC (rev 169389)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-05-27 Gavin Barraclough <baraclough@apple.com>
+
+ Add UI process watchdog on iOS to ensure WebProcess connections close
+ https://bugs.webkit.org/show_bug.cgi?id=133200
+ <rdar://problem/16997983>
+
+ Reviewed by Darin Adler.
+
+ When the WebProcessProxy wants to disconnect from a WebContent process it just drops the connection,
+ and hopes the connection closes. There is a watchdog thread in the ChildProcess to try to ensure this
+ happens.
+
+ On iOS the process may not be runnable at the time, preventing termination. Instead add a watchdog in
+ the UI process to make the process runnable, and to terminate if it doesn't quit in a timely fashion.
+
+ * Platform/IPC/Connection.h:
+ - added terminateSoon.
+ * Platform/IPC/mac/ConnectionMac.mm:
+ (IPC::ConnectionTerminationWatchdog::ConnectionTerminationWatchdog):
+ - take an assertion to make the process runnable, and start a watchdog timer.
+ (IPC::ConnectionTerminationWatchdog::watchdogTimerFired):
+ - if the process hasn't quit by the timer the watchdog fires, kill it.
+ (IPC::Connection::terminateSoon):
+ - create a ConnectionTerminationWatchdog.
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::removeWebPage):
+ - when disconnecting from a process, first tell it to terminateSoon.
+
</ins><span class="cx"> 2014-05-26 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> importance_assertion -> denap_assertion
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (169388 => 169389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-05-27 17:36:21 UTC (rev 169388)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-05-27 17:36:55 UTC (rev 169389)
</span><span class="lines">@@ -183,6 +183,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> bool kill();
</span><ins>+ void terminateSoon(double intervalInSeconds);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (169388 => 169389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-05-27 17:36:21 UTC (rev 169388)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-05-27 17:36:55 UTC (rev 169389)
</span><span class="lines">@@ -36,6 +36,10 @@
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <xpc/xpc.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+#include "ProcessAssertion.h"
+#endif
+
</ins><span class="cx"> #if __has_include(<xpc/private.h>)
</span><span class="cx"> #include <xpc/private.h>
</span><span class="cx"> #else
</span><span class="lines">@@ -65,6 +69,41 @@
</span><span class="cx"> MessageBodyIsOutOfLine = 1 << 0
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+// ConnectionTerminationWatchdog does two things:
+// 1) It sets a watchdog timer to kill the peered process.
+// 2) On iOS, make the process runnable for the duration of the watchdog
+// to ensure it has a chance to terminate cleanly.
+class ConnectionTerminationWatchdog {
+public:
+ static void createConnectionTerminationWatchdog(XPCPtr<xpc_connection_t>& xpcConnection, double intervalInSeconds)
+ {
+ new ConnectionTerminationWatchdog(xpcConnection, intervalInSeconds);
+ }
+
+private:
+ ConnectionTerminationWatchdog(XPCPtr<xpc_connection_t>& xpcConnection, double intervalInSeconds)
+ : m_xpcConnection(xpcConnection)
+ , m_watchdogTimer(RunLoop::main(), this, &ConnectionTerminationWatchdog::watchdogTimerFired)
+#if PLATFORM(IOS)
+ , m_assertion(std::make_unique<WebKit::ProcessAssertion>(xpc_connection_get_pid(m_xpcConnection.get()), WebKit::AssertionState::Background))
+#endif
+ {
+ m_watchdogTimer.startOneShot(intervalInSeconds);
+ }
+
+ void watchdogTimerFired()
+ {
+ xpc_connection_kill(m_xpcConnection.get(), SIGKILL);
+ delete this;
+ }
+
+ XPCPtr<xpc_connection_t> m_xpcConnection;
+ RunLoop::Timer<ConnectionTerminationWatchdog> m_watchdogTimer;
+#if PLATFORM(IOS)
+ std::unique_ptr<WebKit::ProcessAssertion> m_assertion;
+#endif
+};
+
</ins><span class="cx"> void Connection::platformInvalidate()
</span><span class="cx"> {
</span><span class="cx"> if (!m_isConnected)
</span><span class="lines">@@ -97,7 +136,13 @@
</span><span class="cx">
</span><span class="cx"> m_xpcConnection = nullptr;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+void Connection::terminateSoon(double intervalInSeconds)
+{
+ if (m_xpcConnection)
+ ConnectionTerminationWatchdog::createConnectionTerminationWatchdog(m_xpcConnection, intervalInSeconds);
+}
+
</ins><span class="cx"> void Connection::platformInitialize(Identifier identifier)
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (169388 => 169389)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-05-27 17:36:21 UTC (rev 169388)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-05-27 17:36:55 UTC (rev 169389)
</span><span class="lines">@@ -210,6 +210,11 @@
</span><span class="cx"> // We only allow this when using a network process, as otherwise the WebProcess needs to preserve its session state.
</span><span class="cx"> if (m_context->usesNetworkProcess() && canTerminateChildProcess()) {
</span><span class="cx"> abortProcessLaunchIfNeeded();
</span><ins>+#if PLATFORM(IOS)
+ // On iOS deploy a watchdog in the UI process, since the content may be suspended.
+ // 30s should be sufficient for any outstanding activity to complete cleanly.
+ connection()->terminateSoon(30);
+#endif
</ins><span class="cx"> disconnect();
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>