Changeset 89433 in webkit

Timestamp:

Jun 22, 2011 8:44:04 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

2011-06-22 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Martin Robinson.

[GTK] Remove Connection::setShouldCloseConnectionOnProcessTermination()
​https://bugs.webkit.org/show_bug.cgi?id=61627

Don't use Connection::setShouldCloseConnectionOnProcessTermination() for the
GTK port, when the process finishes the connection is closed and
the other process is already notified. We still need to monitor
the child process so that it doesn't become a zombie when it dntabi

• Platform/CoreIPC/Connection.h:
• Platform/CoreIPC/unix/ConnectionUnix.cpp:
• UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp: (WebKit::childFinishedFunction): (WebKit::ProcessLauncher::launchProcess):
• UIProcess/WebProcessProxy.cpp: (WebKit::WebProcessProxy::didFinishLaunching):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/CoreIPC/Connection.h (modified) (1 diff)
• Platform/CoreIPC/unix/ConnectionUnix.cpp (modified) (1 diff)
• UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (modified) (2 diffs)
• UIProcess/WebProcessProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Remove Connection::setShouldCloseConnectionOnProcessTermination()
+        https://bugs.webkit.org/show_bug.cgi?id=61627
+
+        Don't use Connection::setShouldCloseConnectionOnProcessTermination() for the
+        GTK port, when the process finishes the connection is closed and
+        the other process is already notified. We still need to monitor
+        the child process so that it doesn't become a zombie when it dntabi
+
+        * Platform/CoreIPC/Connection.h:
+        * Platform/CoreIPC/unix/ConnectionUnix.cpp:
+        * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+        (WebKit::childFinishedFunction):
+        (WebKit::ProcessLauncher::launchProcess):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::didFinishLaunching):
+
 2011-06-20  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebKit2/Platform/CoreIPC/Connection.h

@@ -119 +119 @@
 #if PLATFORM(MAC)
     void setShouldCloseConnectionOnMachExceptions();
-#elif PLATFORM(QT) || PLATFORM(GTK)
+#elif PLATFORM(QT)
     void setShouldCloseConnectionOnProcessTermination(WebKit::PlatformProcessIdentifier);
 #endif

trunk/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp

@@ -458 +458 @@
 }
 
-#if PLATFORM(QT) || PLATFORM(GTK)
+#if PLATFORM(QT)
 void Connection::setShouldCloseConnectionOnProcessTermination(WebKit::PlatformProcessIdentifier process)
 {

trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp

@@ -57 +57 @@
 }
 
+static void childFinishedFunction(GPid, gint status, gpointer userData)
+{
+    if (WIFEXITED(status) && !WEXITSTATUS(status))
+        return;
+
+    close(GPOINTER_TO_INT(userData));
+}
+
 void ProcessLauncher::launchProcess()
 {
@@ -84 +92 @@
     close(sockets[0]);
     m_processIdentifier = pid;
+
+    // Monitor the child process, it calls waitpid to prevent the child process from becomming a zombie,
+    // and it allows us to close the socket when the child process crashes.
+    g_child_watch_add(m_processIdentifier, childFinishedFunction, GINT_TO_POINTER(sockets[1]));
+
     // We've finished launching the process, message back to the main run loop.
     RunLoop::main()->scheduleWork(WorkItem::create(this, &ProcessLauncher::didFinishLaunchingProcess, m_processIdentifier, sockets[1]));

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -353 +353 @@
 #if PLATFORM(MAC)
     m_connection->setShouldCloseConnectionOnMachExceptions();
-#elif PLATFORM(QT) || PLATFORM(GTK)
+#elif PLATFORM(QT)
     m_connection->setShouldCloseConnectionOnProcessTermination(processIdentifier());
 #endif