Attachment 342576 Details for Bug 184039 – Updated patch

[patch] Updated patch

webkitpy-Implement-coredumpctl-support-on-linux.patch (text/plain), 9.46 KB, created by Thibault Saunier on 2018-06-12 12:17:09 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thibault Saunier

Created: 2018-06-12 12:17:09 PDT

Size: 9.46 KB

patch

obsolete

>From cd43c8ac99c1a4172812c752710ad5f12449166d Mon Sep 17 00:00:00 2001
>From: Thibault Saunier <tsaunier@igalia.com>
>Date: Wed, 11 Apr 2018 11:46:15 -0300
>Subject: [PATCH xserver] webkitpy: Implement coredumpctl support on linux
>
>https://bugs.webkit.org/show_bug.cgi?id=184039
>---
> Tools/ChangeLog                               | 17 +++++
> Tools/Scripts/webkitpy/port/gtk.py            |  3 +-
> .../webkitpy/port/linux_get_crash_log.py      | 62 +++++++++++++++++--
> .../port/linux_get_crash_log_unittest.py      |  9 ++-
> Tools/Scripts/webkitpy/port/wpe.py            |  2 +-
> 5 files changed, 84 insertions(+), 9 deletions(-)
>
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 9e5de992cc0..6f8487c3f21 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-04-11  Thibault Saunier  <tsaunier@igalia.com>
>+
>+        webkitpy: Implement coredumpctl support on linux
>+        https://bugs.webkit.org/show_bug.cgi?id=184039
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        And start using an Executive to run subprocesses
>+        in GDBCrashLogGenerator.
>+
>+        Unit tests adapted to the new API and still passing.
>+
>+        * Scripts/webkitpy/port/linux_get_crash_log.py:
>+        (GDBCrashLogGenerator):
>+        (GDBCrashLogGenerator._get_trace_from_systemd):
>+        (GDBCrashLogGenerator.generate_crash_log):
>+
> 2018-06-11  Chris Dumez  <cdumez@apple.com>
> 
>         Allow enabling PSON in layout tests without window.open support
>diff --git a/Tools/Scripts/webkitpy/port/gtk.py b/Tools/Scripts/webkitpy/port/gtk.py
>index dc7b0fe84f1..42808b35e2b 100644
>--- a/Tools/Scripts/webkitpy/port/gtk.py
>+++ b/Tools/Scripts/webkitpy/port/gtk.py
>@@ -227,7 +227,8 @@ class GtkPort(Port):
>         return super(GtkPort, self).check_sys_deps(needs_http) and self._driver_class().check_driver(self)
> 
>     def _get_crash_log(self, name, pid, stdout, stderr, newer_than, target_host=None):
>-        return GDBCrashLogGenerator(name, pid, newer_than, self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
>+        return GDBCrashLogGenerator(self._executive, name, pid, newer_than,
>+            self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
> 
>     def test_expectations_file_position(self):
>         # GTK port baseline search path is gtk -> wk2 -> generic (as gtk-wk2 and gtk baselines are merged), so port test expectations file is at third to last position.
>diff --git a/Tools/Scripts/webkitpy/port/linux_get_crash_log.py b/Tools/Scripts/webkitpy/port/linux_get_crash_log.py
>index d597024b723..ca3a7989427 100644
>--- a/Tools/Scripts/webkitpy/port/linux_get_crash_log.py
>+++ b/Tools/Scripts/webkitpy/port/linux_get_crash_log.py
>@@ -27,28 +27,70 @@
> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> 
>-import subprocess
>+import datetime
> import os
>+import re
>+import shutil
>+import subprocess
>+import tempfile
>+import time
>+
>+from webkitpy.common.system.executive import ScriptError
> 
> 
> class GDBCrashLogGenerator(object):
>-    def __init__(self, name, pid, newer_than, filesystem, path_to_driver):
>+
>+    def __init__(self, executive, name, pid, newer_than, filesystem, path_to_driver):
>         self.name = name
>         self.pid = pid
>         self.newer_than = newer_than
>         self._filesystem = filesystem
>         self._path_to_driver = path_to_driver
>+        self._executive = executive
> 
>     def _get_gdb_output(self, coredump_path):
>         process_name = self._filesystem.join(os.path.dirname(str(self._path_to_driver())), self.name)
>         cmd = ['gdb', '-ex', 'thread apply all bt 1024', '--batch', process_name, coredump_path]
>-        proc = subprocess.Popen(cmd, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
>+        proc = self._executive.popen(cmd, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
>         stdout, stderr = proc.communicate()
>         errors = [stderr_line.strip().decode('utf8', 'ignore') for stderr_line in stderr.splitlines()]
>         if proc.returncode != 0:
>             stdout = ('ERROR: The gdb process exited with non-zero return code %s\n\n' % proc.returncode) + stdout
>         return (stdout.decode('utf8', 'ignore'), errors)
> 
>+    def _get_trace_from_systemd(self, pid):
>+        # Letting up to 5 seconds for the backtrace to be generated on the systemd side
>+        for try_number in range(5):
>+            if try_number != 0:
>+                # Looping, it means we consider the logs might not be ready yet.
>+                time.sleep(1)
>+
>+            try:
>+                info = self._executive.run_command(['coredumpctl', 'info', str(pid)], return_stderr=True)
>+            except ScriptError, OSError:
>+                continue
>+
>+            if self.newer_than:
>+                found_newer = False
>+                # Coredumpctl will use the latest core dump with the specified PID
>+                # assume it is the right one.
>+                for timestamp in re.findall(r'Timestamp:.*(\d{4}-\d+-\d+ \d+:\d+:\d+)', info):
>+                    date = time.mktime(datetime.datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S").timetuple())
>+                    if date > self.newer_than:
>+                        found_newer = True
>+                        break
>+
>+                if not found_newer:
>+                    continue
>+
>+            temp_file = tempfile.NamedTemporaryFile()
>+            if self._executive.run_command(['coredumpctl', 'dump', pid, '--output', temp_file.name], return_exit_code=True):
>+                continue
>+
>+            return self._get_gdb_output(temp_file.name)
>+
>+        return '', []
>+
>     def generate_crash_log(self, stdout, stderr):
>         pid_representation = str(self.pid or '<unknown>')
>         log_directory = os.environ.get("WEBKIT_CORE_DUMPS_DIRECTORY")
>@@ -62,17 +104,27 @@ class GDBCrashLogGenerator(object):
>                 return filename == expected_crash_dump_filename
>             return filename.find(self.name) > -1
> 
>+        # Poor man which, ignore any failure.
>+        try:
>+            coredumpctl = not self._executive.run_command(['coredumpctl', '--version'], return_exit_code=True)
>+        except:
>+            coredumpctl = False
>+
>         if log_directory:
>-            dumps = self._filesystem.files_under(log_directory, file_filter=match_filename)
>+            dumps = self._filesystem.files_under(
>+                log_directory, file_filter=match_filename)
>             if dumps:
>                 # Get the most recent coredump matching the pid and/or process name.
>                 coredump_path = list(reversed(sorted(dumps)))[0]
>                 if not self.newer_than or self._filesystem.mtime(coredump_path) > self.newer_than:
>                     crash_log, errors = self._get_gdb_output(coredump_path)
>+        elif coredumpctl:
>+            crash_log, errors = self._get_trace_from_systemd(pid_representation)
> 
>         stderr_lines = errors + str(stderr or '<empty>').decode('utf8', 'ignore').splitlines()
>         errors_str = '\n'.join(('STDERR: ' + stderr_line) for stderr_line in stderr_lines)
>-        cppfilt_proc = subprocess.Popen(['c++filt', ], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
>+        cppfilt_proc = self._executive.popen(
>+            ['c++filt'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
>         errors_str = cppfilt_proc.communicate(errors_str)[0]
> 
>         if not crash_log:
>diff --git a/Tools/Scripts/webkitpy/port/linux_get_crash_log_unittest.py b/Tools/Scripts/webkitpy/port/linux_get_crash_log_unittest.py
>index cbd431a92f8..9f3b7e39379 100644
>--- a/Tools/Scripts/webkitpy/port/linux_get_crash_log_unittest.py
>+++ b/Tools/Scripts/webkitpy/port/linux_get_crash_log_unittest.py
>@@ -31,8 +31,10 @@ import os
> import sys
> import unittest
> 
>-from webkitpy.port.linux_get_crash_log import GDBCrashLogGenerator
>+from webkitpy.common.system.executive_mock import MockExecutive
>+from webkitpy.common.system.executive_mock import MockProcess
> from webkitpy.common.system.filesystem_mock import MockFileSystem
>+from webkitpy.port.linux_get_crash_log import GDBCrashLogGenerator
> 
> 
> class GDBCrashLogGeneratorTest(unittest.TestCase):
>@@ -41,7 +43,10 @@ class GDBCrashLogGeneratorTest(unittest.TestCase):
>         if sys.platform.startswith('win'):
>             return
> 
>-        generator = GDBCrashLogGenerator('DumpRenderTree', 28529, newer_than=None, filesystem=MockFileSystem({'/path/to/coredumps': ''}), path_to_driver=None)
>+        executive = MockExecutive()
>+        executive._proc = MockProcess()
>+        executive._proc.stdout = 'STDERR: <empty>'
>+        generator = GDBCrashLogGenerator(executive, 'DumpRenderTree', 28529, newer_than=None, filesystem=MockFileSystem({'/path/to/coredumps': ''}), path_to_driver=None)
> 
>         core_directory = os.environ.get('WEBKIT_CORE_DUMPS_DIRECTORY', '/path/to/coredumps')
>         core_pattern = generator._filesystem.join(core_directory, "core-pid_%p.dump")
>diff --git a/Tools/Scripts/webkitpy/port/wpe.py b/Tools/Scripts/webkitpy/port/wpe.py
>index f439bd9a13d..cf78cbc0cb3 100644
>--- a/Tools/Scripts/webkitpy/port/wpe.py
>+++ b/Tools/Scripts/webkitpy/port/wpe.py
>@@ -107,4 +107,4 @@ class WPEPort(Port):
>         return 2
> 
>     def _get_crash_log(self, name, pid, stdout, stderr, newer_than, target_host=None):
>-        return GDBCrashLogGenerator(name, pid, newer_than, self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
>+        return GDBCrashLogGenerator(self._executive, name, pid, newer_than, self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
>-- 
>2.17.1

Actions: View | Formatted Diff | Diff

Attachments on bug 184039: 336580 | 336581 | 336766 | 336776 | 336983 | 337070 | 337700 | 339979 | 342576