Changeset 141587 in webkit

Timestamp:

Feb 1, 2013 6:17:49 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r141319.
​http://trac.webkit.org/changeset/141319
​https://bugs.webkit.org/show_bug.cgi?id=108629

This patch is causing the UIProcess to hang on GTK port when
loading plugins (Requested by chris-qBT_laptop on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2013-02-01

• UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:

(WebKit::PluginProcessProxy::scanPlugin):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-01  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r141319.
+        http://trac.webkit.org/changeset/141319
+        https://bugs.webkit.org/show_bug.cgi?id=108629
+
+        This patch is causing the UIProcess to hang on GTK port when
+        loading plugins (Requested by chris-qBT_laptop on #webkit).
+
+        * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+        (WebKit::PluginProcessProxy::scanPlugin):
+
 2013-02-01  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
 

trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp

@@ -59 +59 @@
 }
 
-static bool spawnProcessSync(char** argv, char** standardOutput, char** standardError, int* exitStatus)
-{
-    // If the disposition of SIGCHLD signal is set to SIG_IGN (default) then
-    // the signal will be ignored and g_spawn_sync() will not be able to return
-    // the status. As a consequence, we make sure that the disposition is set
-    // to SIG_DFL before calling g_spawn_sync().
-    struct sigaction defaultAction, oldAction;
-    defaultAction.sa_handler = SIG_DFL;
-    defaultAction.sa_flags = 0;
-    sigemptyset(&defaultAction.sa_mask);
-    sigaction(SIGCHLD, &defaultAction, &oldAction);
-
-    bool success = g_spawn_sync(0, argv, 0, G_SPAWN_STDERR_TO_DEV_NULL, 0, 0, standardOutput, standardError, exitStatus, 0);
-
-    // Restore SIGCHLD signal disposition.
-    sigaction(SIGCHLD, &oldAction, 0);
-
-    return success;
-}
-
 bool PluginProcessProxy::scanPlugin(const String& pluginPath, RawPluginMetaData& result)
 {
@@ -93 +73 @@
     char* stdOut = 0;
 
+    // If the disposition of SIGCLD signal is set to SIG_IGN (default)
+    // then the signal will be ignored and g_spawn_sync() will not be
+    // able to return the status.
+    // As a consequence, we make sure that the disposition is set to
+    // SIG_DFL before calling g_spawn_sync().
+    struct sigaction action;
+    sigaction(SIGCLD, 0, &action);
+    if (action.sa_handler == SIG_IGN) {
+        action.sa_handler = SIG_DFL;
+        sigaction(SIGCLD, &action, 0);
+    }
 
-    if (!spawnProcessSync(argv, &stdOut, 0, &status))
+    if (!g_spawn_sync(0, argv, 0, G_SPAWN_STDERR_TO_DEV_NULL, 0, 0, &stdOut, 0, &status, 0))
         return false;