Changeset 153721 in webkit

Timestamp:

Aug 5, 2013, 1:26:29 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Implement leak checking with valgrind
​https://bugs.webkit.org/show_bug.cgi?id=118785

Patch by Brian Holt <​brian.holt@samsung.com> on 2013-08-05
Reviewed by Dirk Pranke.

Launch the DRT under Valgrind to generate xml files with details
of leaks found.

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(parse_args):

• Scripts/webkitpy/port/gtk.py:

(GtkPort.init):
(GtkPort.default_timeout_ms): Allow extra time to run under
Valgrind.
(GtkPort.setup_environ_for_server): Pass Valgrind instructions
using environment variables.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2013-08-05  Brian Holt  <brian.holt@samsung.com>
+
+        [GTK] Implement leak checking with valgrind
+        https://bugs.webkit.org/show_bug.cgi?id=118785
+
+        Reviewed by Dirk Pranke.
+
+        Launch the DRT under Valgrind to generate xml files with details
+        of leaks found.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        (parse_args):
+        * Scripts/webkitpy/port/gtk.py:
+        (GtkPort.__init__):
+        (GtkPort.default_timeout_ms): Allow extra time to run under
+        Valgrind.
+        (GtkPort.setup_environ_for_server): Pass Valgrind instructions
+        using environment variables.
+
 2013-08-02  Mario Sanchez Prada  <mario.prada@samsung.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -111 +111 @@
             help="Use the complex text code path for all text (Mac OS X and Windows only)"),
         optparse.make_option("-l", "--leaks", action="store_true", default=False,
-            help="Enable leaks checking (Mac OS X only)"),
+            help="Enable leaks checking (Mac OS X and Gtk+ only)"),
         optparse.make_option("-g", "--guard-malloc", action="store_true", default=False,
             help="Enable Guard Malloc (Mac OS X only)"),

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

@@ -1 +1 @@
 # Copyright (C) 2010 Google Inc. All rights reserved.
+# Copyright (C) 2013 Samsung Electronics.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29 +30 @@
 import os
 import subprocess
+import uuid
 
 from webkitpy.common.memoized import memoized
@@ -45 +47 @@
         self._pulseaudio_sanitizer = PulseAudioSanitizer()
 
+        if self.get_option("leaks"):
+            if not self.get_option("wrapper"):
+                raise ValueError('use --wrapper=\"valgrind\" for memory leak detection on GTK')
+
     def warn_if_bug_missing_in_test_expectations(self):
         return not self.get_option('webkit_test_runner')
@@ -58 +64 @@
 
     def default_timeout_ms(self):
+        # Starting an application under Valgrind takes a lot longer than normal
+        # so increase the timeout (empirically 10x is enough to avoid timeouts).
+        multiplier = 10 if self.get_option("leaks") else 1
         if self.get_option('configuration') == 'Debug':
-            return 12 * 1000
-        return 6 * 1000
+            return multiplier * 12 * 1000
+        return multiplier * 6 * 1000
 
     def setup_test_run(self):
@@ -80 +89 @@
         environment['AUDIO_RESOURCES_PATH'] = self.path_from_webkit_base('Source', 'WebCore', 'platform', 'audio', 'resources')
         self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
+        if self.get_option("leaks"):
+            #  Turn off GLib memory optimisations https://wiki.gnome.org/Valgrind.
+            environment['G_SLICE'] = 'always-malloc'
+            environment['G_DEBUG'] = 'gc-friendly'
+            xmlfilename = "".join(("drt-%p-", uuid.uuid1().hex, "-leaks.xml"))
+            xmlfile = os.path.join(self.results_directory(), xmlfilename)
+            environment['VALGRIND_OPTS'] = \
+                "--tool=memcheck " \
+                "--num-callers=40 " \
+                "--demangle=no " \
+                "--trace-children=no " \
+                "--smc-check=all-non-file " \
+                "--leak-check=yes " \
+                "--leak-resolution=high " \
+                "--show-possibly-lost=no " \
+                "--show-reachable=no " \
+                "--leak-check=full " \
+                "--undef-value-errors=no " \
+                "--gen-suppressions=all " \
+                "--xml=yes " \
+                "--xml-file=\"%s\" " % (xmlfile)
         return environment