Changeset 236988 in webkit

Timestamp:

Oct 9, 2018, 4:25:46 PM (8 years ago)

Author:

Chris Dumez

Message:

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):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (2 diffs)
• NetworkProcess/NetworkProcess.h (modified) (1 diff)
• PluginProcess/PluginProcess.cpp (modified) (2 diffs)
• PluginProcess/PluginProcess.h (modified) (1 diff)
• Shared/ChildProcess.cpp (modified) (2 diffs)
• Shared/ChildProcess.h (modified) (1 diff)
• WebProcess/WebProcess.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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):
+
 2018-10-09  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -109 +109 @@
 using namespace WebCore;
 
+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);
+    });
+}
+
 NetworkProcess& NetworkProcess::singleton()
 {
@@ -359 +374 @@
 {
     ChildProcess::initializeConnection(connection);
+
+    // 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);
 
     for (auto& supplement : m_supplements.values())

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

@@ -247 +247 @@
     void initializeConnection(IPC::Connection*) override;
     bool shouldTerminate() override;
-    bool shouldCallExitWhenConnectionIsClosed() const final { return false; } // We override didClose() and want it to be called.
 
     // IPC::Connection::Client

trunk/Source/WebKit/PluginProcess/PluginProcess.cpp

@@ -53 +53 @@
 namespace WebKit {
 
+NO_RETURN static void callExit(IPC::Connection*)
+{
+    _exit(EXIT_SUCCESS);
+}
+
 PluginProcess& PluginProcess::singleton()
 {
@@ -77 +82 @@
     m_pluginPath = parameters.extraInitializationData.get("plugin-path");
     platformInitializeProcess(parameters);
+}
+
+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);
 }
 

trunk/Source/WebKit/PluginProcess/PluginProcess.h

@@ -83 +83 @@
     void initializeProcess(const ChildProcessInitializationParameters&) override;
     void initializeProcessName(const ChildProcessInitializationParameters&) override;
+    void initializeConnection(IPC::Connection*) override;
     void initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&) override;
     bool shouldTerminate() override;

trunk/Source/WebKit/Shared/ChildProcess.cpp

@@ -57 +57 @@
 void ChildProcess::didClose(IPC::Connection&)
 {
-}
-
-NO_RETURN static void callExitNow(IPC::Connection*)
-{
     _exit(EXIT_SUCCESS);
-}
-
-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);
-    });
 }
 
@@ -100 +81 @@
 
     m_connection = IPC::Connection::createClientConnection(parameters.connectionIdentifier, *this);
-    if (shouldCallExitWhenConnectionIsClosed())
-        m_connection->setDidCloseOnConnectionWorkQueueCallback(callExitNow);
-    else
-        m_connection->setDidCloseOnConnectionWorkQueueCallback(callExitSoon);
-
     initializeConnection(m_connection.get());
     m_connection->open();

trunk/Source/WebKit/Shared/ChildProcess.h

@@ -96 +96 @@
     virtual void terminate();
 
-    virtual bool shouldCallExitWhenConnectionIsClosed() const { return true; }
     virtual void stopRunLoop();
 

trunk/Source/WebKit/WebProcess/WebProcess.cpp

@@ -158 +158 @@
 using namespace WebCore;
 
+NO_RETURN static void callExit(IPC::Connection*)
+{
+    _exit(EXIT_SUCCESS);
+}
+
 WebProcess& WebProcess::singleton()
 {
@@ -227 +232 @@
 {
     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);
 
 #if !PLATFORM(GTK) && !PLATFORM(WPE)