Changeset 72077 in webkit

Timestamp:

Nov 16, 2010 3:50:02 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-11-15 Andreas Kling <​kling@webkit.org>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Kill the web process if the UI process dies

Connect UI (parent) process death signal to SIGKILL of the web
process (child). This ensures that there's no stale web processes
after the UI process has crashed.

Original patch by Kimmo Kinnunen.

• UIProcess/Launcher/qt/ProcessLauncherQt.cpp: (WebKit::QtWebProcess::QtWebProcess): (WebKit::QtWebProcess::setupChildProcess): (WebKit::ProcessLauncherHelper::launch):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/qt/ProcessLauncherQt.cpp (modified) (3 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-11-15  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Kill the web process if the UI process dies
+
+        Connect UI (parent) process death signal to SIGKILL of the web
+        process (child). This ensures that there's no stale web processes
+        after the UI process has crashed.
+
+        Original patch by Kimmo Kinnunen.
+
+        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+        (WebKit::QtWebProcess::QtWebProcess):
+        (WebKit::QtWebProcess::setupChildProcess):
+        (WebKit::ProcessLauncherHelper::launch):
+
 2010-11-16  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp

@@ -48 +48 @@
 #include <sys/resource.h>
 #include <unistd.h>
+#if defined Q_OS_UNIX
+#include <sys/prctl.h>
+#include <signal.h>
+#endif
 
 using namespace WebCore;
@@ -68 +72 @@
 };
 
+class QtWebProcess : public QProcess
+{
+    Q_OBJECT
+public:
+    QtWebProcess(QObject* parent = 0)
+        : QProcess(parent)
+    {}
+
+protected:
+    virtual void setupChildProcess();
+};
+
+void QtWebProcess::setupChildProcess()
+{
+#if defined Q_OS_UNIX
+    prctl(PR_SET_PDEATHSIG, SIGKILL);
+#endif
+}
+
 void ProcessLauncherHelper::launch(WebKit::ProcessLauncher* launcher)
 {
@@ -80 +103 @@
     QString program(applicationPath.arg(m_server.serverName()));
 
-    QProcess* webProcess = new QProcess();
+    QProcess* webProcess = new QtWebProcess();
     webProcess->setProcessChannelMode(QProcess::ForwardedChannels);
     webProcess->start(program);