Changeset 87591 in webkit

Timestamp:

May 27, 2011 6:56:23 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-05-27 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Ojan Vafai.

NRWT: debug messages from the workers are being logged twice
​https://bugs.webkit.org/show_bug.cgi?id=60428

It looks like when the workers are run in separate processes
we end up getting two copies of every log message they print.
This has to do with the multiprocessing module on UNIX cloning
the log configuration in a way I wasn't expecting, and so two
log handlers end up getting registered.

• Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py:
• Scripts/webkitpy/layout_tests/layout_package/printing.py:
• Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/printing.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-27  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        NRWT: debug messages from the workers are being logged twice
+        https://bugs.webkit.org/show_bug.cgi?id=60428
+
+        It looks like when the workers are run in separate processes
+        we end up getting two copies of every log message they print.
+        This has to do with the multiprocessing module on UNIX cloning
+        the log configuration in a way I wasn't expecting, and so two
+        log handlers end up getting registered.
+
+        * Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py:
+        * Scripts/webkitpy/layout_tests/layout_package/printing.py:
+        * Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2011-05-27  Adam Roben  <aroben@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py

@@ -320 +320 @@
             options = self._options
             port_obj = port.get(self._platform_name, options)
+
+            # The unix multiprocessing implementation clones the
+            # log handler configuration into the child processes,
+            # but the win implementation doesn't.
+            configure_logging = (sys.platform == 'win32')
+
             # FIXME: this won't work if the calling process is logging
             # somewhere other than sys.stderr and sys.stdout, but I'm not sure
             # if this will be an issue in practice.
             printer = printing.Printer(port_obj, options, sys.stderr, sys.stdout,
-                int(options.child_processes), options.experimental_fully_parallel)
+                int(options.child_processes), options.experimental_fully_parallel,
+                configure_logging)
             self._client.run(port_obj)
             printer.cleanup()

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py

@@ -211 +211 @@
     output gets logged to stderr."""
     def __init__(self, port, options, regular_output, buildbot_output,
-                 child_processes, is_fully_parallel):
+                 child_processes, is_fully_parallel, configure_logging):
         """
         Args
@@ -225 +225 @@
                              in shards (usually controlled by
                              --experimental-fully-parallel)
-
-        Note that the last two args are separate rather than bundled into
+          configure_loggign  Whether a logging handler should be registered
+
+        Note that the fourth and fifth args are separate rather than bundled into
         the options structure so that this object does not assume any flags
         set in options that weren't returned from logging_options(), above.
@@ -245 +246 @@
         self._meter = metered_stream.MeteredStream(options.verbose,
                                                    regular_output)
-        self._logging_handler = _configure_logging(self._meter,
-            options.verbose)
+        self._logging_handler = None
+        if configure_logging:
+            self._logging_handler = _configure_logging(self._meter, options.verbose)
 
         self.switches = parse_print_options(options.print_options,

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py

@@ -128 +128 @@
         printer = printing.Printer(self._port, options, regular_output,
                                    buildbot_output, single_threaded,
-                                   is_fully_parallel)
+                                   is_fully_parallel,
+                                   configure_logging=True)
         return printer, regular_output, buildbot_output
 

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

@@ -73 +73 @@
 
     printer = printing.Printer(port, options, regular_output, buildbot_output,
-        int(options.child_processes), options.experimental_fully_parallel)
+        int(options.child_processes), options.experimental_fully_parallel,
+        configure_logging=True)
     for w in warnings:
         _log.warning(w)