<!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>[236988] trunk/Source/WebKit</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/236988">236988</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2018-10-09 16:25:46 -0700 (Tue, 09 Oct 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>Allow behavior when the parent process IPC::Connection closes to be overridden by ChildProcess subclasses
https://bugs.webkit.org/show_bug.cgi?id=190294

Reviewed by Geoffrey Garen.

Allow behavior when the parent process IPC::Connection closes to be overridden by ChildProcess subclasses.
This will be useful to allow the NetworkProcess to not exit if it still has pending downloads.

* NetworkProcess/NetworkProcess.cpp:
(WebKit::callExitSoon):
(WebKit::NetworkProcess::initializeConnection):
* NetworkProcess/NetworkProcess.h:
* PluginProcess/PluginProcess.cpp:
(WebKit::callExit):
(WebKit::PluginProcess::initializeConnection):
* PluginProcess/PluginProcess.h:
* Shared/ChildProcess.cpp:
(WebKit::ChildProcess::didClose):
(WebKit::ChildProcess::initialize):
(WebKit::callExitNow): Deleted.
(WebKit::callExitSoon): Deleted.
* Shared/ChildProcess.h:
(WebKit::ChildProcess::shouldCallExitWhenConnectionIsClosed const): Deleted.
* WebProcess/WebProcess.cpp:
(WebKit::callExit):
(WebKit::WebProcess::initializeConnection):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkProcesscpp">trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKitNetworkProcessNetworkProcessh">trunk/Source/WebKit/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKitPluginProcessPluginProcesscpp">trunk/Source/WebKit/PluginProcess/PluginProcess.cpp</a></li>
<li><a href="#trunkSourceWebKitPluginProcessPluginProcessh">trunk/Source/WebKit/PluginProcess/PluginProcess.h</a></li>
<li><a href="#trunkSourceWebKitSharedChildProcesscpp">trunk/Source/WebKit/Shared/ChildProcess.cpp</a></li>
<li><a href="#trunkSourceWebKitSharedChildProcessh">trunk/Source/WebKit/Shared/ChildProcess.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebProcesscpp">trunk/Source/WebKit/WebProcess/WebProcess.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (236987 => 236988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2018-10-09 23:21:18 UTC (rev 236987)
+++ trunk/Source/WebKit/ChangeLog       2018-10-09 23:25:46 UTC (rev 236988)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2018-10-09  Chris Dumez  <cdumez@apple.com>
+
+        Allow behavior when the parent process IPC::Connection closes to be overridden by ChildProcess subclasses
+        https://bugs.webkit.org/show_bug.cgi?id=190294
+
+        Reviewed by Geoffrey Garen.
+
+        Allow behavior when the parent process IPC::Connection closes to be overridden by ChildProcess subclasses.
+        This will be useful to allow the NetworkProcess to not exit if it still has pending downloads.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::callExitSoon):
+        (WebKit::NetworkProcess::initializeConnection):
+        * NetworkProcess/NetworkProcess.h:
+        * PluginProcess/PluginProcess.cpp:
+        (WebKit::callExit):
+        (WebKit::PluginProcess::initializeConnection):
+        * PluginProcess/PluginProcess.h:
+        * Shared/ChildProcess.cpp:
+        (WebKit::ChildProcess::didClose):
+        (WebKit::ChildProcess::initialize):
+        (WebKit::callExitNow): Deleted.
+        (WebKit::callExitSoon): Deleted.
+        * Shared/ChildProcess.h:
+        (WebKit::ChildProcess::shouldCallExitWhenConnectionIsClosed const): Deleted.
+        * WebProcess/WebProcess.cpp:
+        (WebKit::callExit):
+        (WebKit::WebProcess::initializeConnection):
+
</ins><span class="cx"> 2018-10-09  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         WebDriver: thrown ObjC exception under -[WKFullScreenWindowController windowDidFailToEnterFullScreen:] when session is terminated
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (236987 => 236988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp    2018-10-09 23:21:18 UTC (rev 236987)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp       2018-10-09 23:25:46 UTC (rev 236988)
</span><span class="lines">@@ -108,6 +108,21 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><ins>+static void callExitSoon(IPC::Connection*)
+{
+    // If the connection has been closed and we haven't responded in the main thread for 10 seconds
+    // the process will exit forcibly.
+    auto watchdogDelay = 10_s;
+
+    WorkQueue::create("com.apple.WebKit.ChildProcess.WatchDogQueue")->dispatchAfter(watchdogDelay, [] {
+        // We use _exit here since the watchdog callback is called from another thread and we don't want
+        // global destructors or atexit handlers to be called from this thread while the main thread is busy
+        // doing its thing.
+        RELEASE_LOG_ERROR(IPC, "Exiting process early due to unacknowledged closed-connection");
+        _exit(EXIT_FAILURE);
+    });
+}
+
</ins><span class="cx"> NetworkProcess& NetworkProcess::singleton()
</span><span class="cx"> {
</span><span class="cx">     static NeverDestroyed<NetworkProcess> networkProcess;
</span><span class="lines">@@ -359,6 +374,10 @@
</span><span class="cx"> {
</span><span class="cx">     ChildProcess::initializeConnection(connection);
</span><span class="cx"> 
</span><ins>+    // We give a chance for didClose() to get called on the main thread but forcefully call _exit() after a delay
+    // in case the main thread is unresponsive or didClose() takes too long.
+    connection->setDidCloseOnConnectionWorkQueueCallback(callExitSoon);
+
</ins><span class="cx">     for (auto& supplement : m_supplements.values())
</span><span class="cx">         supplement->initializeConnection(connection);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitNetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (236987 => 236988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h      2018-10-09 23:21:18 UTC (rev 236987)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2018-10-09 23:25:46 UTC (rev 236988)
</span><span class="lines">@@ -246,7 +246,6 @@
</span><span class="cx">     void initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&) override;
</span><span class="cx">     void initializeConnection(IPC::Connection*) override;
</span><span class="cx">     bool shouldTerminate() override;
</span><del>-    bool shouldCallExitWhenConnectionIsClosed() const final { return false; } // We override didClose() and want it to be called.
</del><span class="cx"> 
</span><span class="cx">     // IPC::Connection::Client
</span><span class="cx">     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
</span></span></pre></div>
<a id="trunkSourceWebKitPluginProcessPluginProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PluginProcess/PluginProcess.cpp (236987 => 236988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PluginProcess/PluginProcess.cpp      2018-10-09 23:21:18 UTC (rev 236987)
+++ trunk/Source/WebKit/PluginProcess/PluginProcess.cpp 2018-10-09 23:25:46 UTC (rev 236988)
</span><span class="lines">@@ -52,6 +52,11 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><ins>+NO_RETURN static void callExit(IPC::Connection*)
+{
+    _exit(EXIT_SUCCESS);
+}
+
</ins><span class="cx"> PluginProcess& PluginProcess::singleton()
</span><span class="cx"> {
</span><span class="cx">     static NeverDestroyed<PluginProcess> pluginProcess;
</span><span class="lines">@@ -78,6 +83,15 @@
</span><span class="cx">     platformInitializeProcess(parameters);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void PluginProcess::initializeConnection(IPC::Connection* connection)
+{
+    ChildProcess::initializeConnection(connection);
+
+    // We call _exit() directly from the background queue in case the main thread is unresponsive
+    // and ChildProcess::didClose() does not get called.
+    connection->setDidCloseOnConnectionWorkQueueCallback(callExit);
+}
+
</ins><span class="cx"> void PluginProcess::removeWebProcessConnection(WebProcessConnection* webProcessConnection)
</span><span class="cx"> {
</span><span class="cx">     size_t vectorIndex = m_webProcessConnections.find(webProcessConnection);
</span></span></pre></div>
<a id="trunkSourceWebKitPluginProcessPluginProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PluginProcess/PluginProcess.h (236987 => 236988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PluginProcess/PluginProcess.h        2018-10-09 23:21:18 UTC (rev 236987)
+++ trunk/Source/WebKit/PluginProcess/PluginProcess.h   2018-10-09 23:25:46 UTC (rev 236988)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx">     // ChildProcess
</span><span class="cx">     void initializeProcess(const ChildProcessInitializationParameters&) override;
</span><span class="cx">     void initializeProcessName(const ChildProcessInitializationParameters&) override;
</span><ins>+    void initializeConnection(IPC::Connection*) override;
</ins><span class="cx">     void initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&) override;
</span><span class="cx">     bool shouldTerminate() override;
</span><span class="cx">     void platformInitializeProcess(const ChildProcessInitializationParameters&);
</span></span></pre></div>
<a id="trunkSourceWebKitSharedChildProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/ChildProcess.cpp (236987 => 236988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/ChildProcess.cpp      2018-10-09 23:21:18 UTC (rev 236987)
+++ trunk/Source/WebKit/Shared/ChildProcess.cpp 2018-10-09 23:25:46 UTC (rev 236988)
</span><span class="lines">@@ -56,28 +56,9 @@
</span><span class="cx"> 
</span><span class="cx"> void ChildProcess::didClose(IPC::Connection&)
</span><span class="cx"> {
</span><del>-}
-
-NO_RETURN static void callExitNow(IPC::Connection*)
-{
</del><span class="cx">     _exit(EXIT_SUCCESS);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void callExitSoon(IPC::Connection*)
-{
-    // If the connection has been closed and we haven't responded in the main thread for 10 seconds
-    // the process will exit forcibly.
-    auto watchdogDelay = 10_s;
-
-    WorkQueue::create("com.apple.WebKit.ChildProcess.WatchDogQueue")->dispatchAfter(watchdogDelay, [] {
-        // We use _exit here since the watchdog callback is called from another thread and we don't want
-        // global destructors or atexit handlers to be called from this thread while the main thread is busy
-        // doing its thing.
-        RELEASE_LOG_ERROR(IPC, "Exiting process early due to unacknowledged closed-connection");
-        _exit(EXIT_FAILURE);
-    });
-}
-
</del><span class="cx"> void ChildProcess::initialize(const ChildProcessInitializationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx">     RELEASE_ASSERT_WITH_MESSAGE(parameters.processIdentifier, "Unable to initialize child process without a WebCore process identifier");
</span><span class="lines">@@ -99,11 +80,6 @@
</span><span class="cx">     PAL::SessionID::enableGenerationProtection();
</span><span class="cx"> 
</span><span class="cx">     m_connection = IPC::Connection::createClientConnection(parameters.connectionIdentifier, *this);
</span><del>-    if (shouldCallExitWhenConnectionIsClosed())
-        m_connection->setDidCloseOnConnectionWorkQueueCallback(callExitNow);
-    else
-        m_connection->setDidCloseOnConnectionWorkQueueCallback(callExitSoon);
-
</del><span class="cx">     initializeConnection(m_connection.get());
</span><span class="cx">     m_connection->open();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitSharedChildProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/ChildProcess.h (236987 => 236988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/ChildProcess.h        2018-10-09 23:21:18 UTC (rev 236987)
+++ trunk/Source/WebKit/Shared/ChildProcess.h   2018-10-09 23:25:46 UTC (rev 236988)
</span><span class="lines">@@ -95,7 +95,6 @@
</span><span class="cx">     virtual bool shouldTerminate() = 0;
</span><span class="cx">     virtual void terminate();
</span><span class="cx"> 
</span><del>-    virtual bool shouldCallExitWhenConnectionIsClosed() const { return true; }
</del><span class="cx">     virtual void stopRunLoop();
</span><span class="cx"> 
</span><span class="cx"> #if USE(APPKIT)
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (236987 => 236988)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebProcess.cpp    2018-10-09 23:21:18 UTC (rev 236987)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp       2018-10-09 23:25:46 UTC (rev 236988)
</span><span class="lines">@@ -157,6 +157,11 @@
</span><span class="cx"> using namespace JSC;
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><ins>+NO_RETURN static void callExit(IPC::Connection*)
+{
+    _exit(EXIT_SUCCESS);
+}
+
</ins><span class="cx"> WebProcess& WebProcess::singleton()
</span><span class="cx"> {
</span><span class="cx">     static WebProcess& process = *new WebProcess;
</span><span class="lines">@@ -227,6 +232,10 @@
</span><span class="cx"> {
</span><span class="cx">     ChildProcess::initializeConnection(connection);
</span><span class="cx"> 
</span><ins>+    // We call _exit() directly from the background queue in case the main thread is unresponsive
+    // and ChildProcess::didClose() does not get called.
+    connection->setDidCloseOnConnectionWorkQueueCallback(callExit);
+
</ins><span class="cx"> #if !PLATFORM(GTK) && !PLATFORM(WPE)
</span><span class="cx">     connection->setShouldExitOnSyncMessageSendFailure(true);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>