Changeset 139743 in webkit

Timestamp:

Jan 15, 2013 8:03:37 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[GTK] Waiting on the gdb process will lead to deadlock
​https://bugs.webkit.org/show_bug.cgi?id=106906

Reviewed by Philippe Normand.

Use communicate() rather than wait() on the Popen object that's running the gdb
command. This avoids the deadlock that occurs on the GTK builders.

• Scripts/webkitpy/layout_tests/port/gtk.py:

(GtkPort._get_gdb_output):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/gtk.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-15  Zan Dobersek  <zdobersek@igalia.com>
+
+        [GTK] Waiting on the gdb process will lead to deadlock
+        https://bugs.webkit.org/show_bug.cgi?id=106906
+
+        Reviewed by Philippe Normand.
+
+        Use communicate() rather than wait() on the Popen object that's running the gdb
+        command. This avoids the deadlock that occurs on the GTK builders.
+
+        * Scripts/webkitpy/layout_tests/port/gtk.py:
+        (GtkPort._get_gdb_output):
+
 2013-01-15  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py

@@ -128 +128 @@
         cmd = ['gdb', '-ex', 'thread apply all bt 1024', '--batch', str(self._path_to_driver()), coredump_path]
         proc = subprocess.Popen(cmd, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        proc.wait()
-        errors = [l.strip().decode('utf8', 'ignore') for l in proc.stderr.readlines()]
-        trace = proc.stdout.read().decode('utf8', 'ignore')
-        return (trace, errors)
+        stdout, stderr = proc.communicate()
+        errors = [l.strip().decode('utf8', 'ignore') for l in stderr.splitlines()]
+        return (stdout.decode('utf8', 'ignore'), errors)
 
     def _get_crash_log(self, name, pid, stdout, stderr, newer_than):