Changeset 79062 in webkit

Timestamp:

Feb 18, 2011 6:18:40 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-02-18 Dirk Pranke <​dpranke@chromium.org>

Reviewed by James Robinson.

new-run-webkit-tests: enable multiple processes by default on
mac. This change removes the artificial restrictions we placed
on the # of child processes we used with the old threading
model, and switches to the new message-based model and multiple
processes, where available. If multiple processes are not
available (Leopard / Python 2.5), then we use the 'inline' model
instead of the 'old-threads' model on the 'mac' port or one
process on the 'chromium-mac' port. We need additional testing
to see if the new 'threads' model works reliably and is worth
supporting, or if we should just live with things being slightly
slow.

​https://bugs.webkit.org/show_bug.cgi?id=54596

• Scripts/webkitpy/layout_tests/port/chromium_mac.py:
• Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
• Scripts/webkitpy/layout_tests/port/mac.py:
• Scripts/webkitpy/layout_tests/port/mac_unittest.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_mac.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/mac.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/mac_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-02-18  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by James Robinson.
+
+        new-run-webkit-tests: enable multiple processes by default on
+        mac. This change removes the artificial restrictions we placed
+        on the # of child processes we used with the old threading
+        model, and switches to the new message-based model and multiple
+        processes, where available. If multiple processes are not
+        available (Leopard / Python 2.5), then we use the 'inline' model
+        instead of the 'old-threads' model on the 'mac' port or one
+        process on the 'chromium-mac' port. We need additional testing
+        to see if the new 'threads' model works reliably and is worth
+        supporting, or if we should just live with things being slightly
+        slow.
+
+        https://bugs.webkit.org/show_bug.cgi?id=54596
+
+        * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+        * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2011-02-18  Andrew Wilson  <atwilson@chromium.org>
 

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

@@ -34 +34 @@
 import signal
 
+# Handle Python < 2.6 where multiprocessing isn't available.
+try:
+    import multiprocessing
+except ImportError:
+    multiprocessing = None
+
 from webkitpy.layout_tests.port import mac
 from webkitpy.layout_tests.port import chromium
@@ -100 +106 @@
         return result
 
-    def default_child_processes(self):
-        if self.get_option('worker_model') == 'old-threads':
-            # FIXME: we need to run single-threaded for now. See
-            # https://bugs.webkit.org/show_bug.cgi?id=38553. Unfortunately this
-            # routine is called right before the logger is configured, so if we
-            # try to _log.warning(), it gets thrown away.
-            import sys
-            sys.stderr.write("Defaulting to one child - see https://bugs.webkit.org/show_bug.cgi?id=38553\n")
-            return 1
-
-        return chromium.ChromiumPort.default_child_processes(self)
+    def default_worker_model(self):
+        if multiprocessing:
+            return 'processes'
+        return 'inline'
 
     def driver_name(self):

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

@@ -29 +29 @@
 import unittest
 
+# Handle Python < 2.6 where multiprocessing isn't available.
+try:
+    import multiprocessing
+except ImportError:
+    multiprocessing = None
+
 from webkitpy.thirdparty.mock import Mock
 
@@ -46 +52 @@
         # Currently is always true, just logs if missing.
         self.assertTrue(port._check_wdiff_install())
+
+    def test_check_default_worker_model(self):
+        port = chromium_mac.ChromiumMacPort()
+        if multiprocessing:
+            self.assertEqual(port.default_worker_model(), 'processes')
+        else:
+            self.assertEqual(port.default_worker_model(), 'inline')
 
     def assert_name(self, port_name, os_version_string, expected):

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

@@ -33 +33 @@
 import platform
 import signal
+
+# Handle Python < 2.6 where multiprocessing isn't available.
+try:
+    import multiprocessing
+except ImportError:
+    multiprocessing = None
+
 
 from webkitpy.layout_tests.port.webkit import WebKitPort
@@ -84 +91 @@
         WebKitPort.__init__(self, port_name=port_name, **kwargs)
 
-    def default_child_processes(self):
-        # FIXME: new-run-webkit-tests is unstable on Mac running more than
-        # four threads in parallel.
-        # See https://bugs.webkit.org/show_bug.cgi?id=36622
-        child_processes = WebKitPort.default_child_processes(self)
-        if self.get_option('worker_model') == 'old-threads' and child_processes > 4:
-            return 4
-        return child_processes
+    def default_worker_model(self):
+        if multiprocessing:
+            return 'processes'
+        return 'inline'
 
     def baseline_search_path(self):

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

@@ -31 +31 @@
 import unittest
 
+# Handle Python < 2.6 where multiprocessing isn't available.
+try:
+    import multiprocessing
+except ImportError:
+    multiprocessing = None
+
 from webkitpy.layout_tests.port import mac
 from webkitpy.layout_tests.port import port_testcase
@@ -48 +54 @@
         relative_paths = [path[len(port.path_from_webkit_base()):] for path in skipped_paths]
         self.assertEqual(relative_paths, expected_paths)
+
+    def test_default_worker_model(self):
+        port = mac.MacPort()
+        if multiprocessing:
+            self.assertEqual(port.default_worker_model(), 'processes')
+        else:
+            self.assertEqual(port.default_worker_model(), 'inline')
 
     def test_skipped_file_paths(self):

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

@@ -43 +43 @@
 import unittest
 
+try:
+    import multiprocessing
+except ImportError:
+    multiprocessing = None
+
 from webkitpy.common import array_stream
 from webkitpy.common.system import outputcapture
@@ -470 +475 @@
         # FIXME: remove this when we fix test-webkitpy to work properly
         # with the multiprocessing module (bug 54520).
-        if compare_version(sys, '2.6')[0] >= 0 and sys.platform not in ('cygwin', 'win32'):
+        if multiprocessing and sys.platform not in ('cygwin', 'win32'):
             self.assertTrue(passing_run(['--worker-model', 'processes']))
 
     def test_worker_model__processes_and_dry_run(self):
-        if compare_version(sys, '2.6')[0] >= 0 and sys.platform not in ('cygwin', 'win32'):
+        if multiprocessing and sys.platform not in ('cygwin', 'win32'):
             self.assertTrue(passing_run(['--worker-model', 'processes', '--dry-run']))