Changeset 122513 in webkit

Timestamp:

Jul 12, 2012 2:55:37 PM (12 years ago)

Author:

dpranke@chromium.org

Message:

webkitpy: rename manager_worker_broker to message_pool
​https://bugs.webkit.org/show_bug.cgi?id=91145

Reviewed by Ojan Vafai.

Since the MessagePool interface is more generic (and simpler)
now and will be reused by test-webkitpy, I'm renaming it and
moving it to webkitpy.common.

• Scripts/webkitpy/common/message_pool.py: Renamed from Tools/Scripts/webkitpy/layout_tests/controllers/manager_worker_broker.py.
• Scripts/webkitpy/layout_tests/controllers/manager.py:

(TestRunInterruptedException.reduce):
(Manager._run_tests.worker_factory):
(Manager._run_tests):

• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/message_pool.py (moved) (moved from trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_worker_broker.py) (3 diffs, 1 prop)
• Scripts/webkitpy/layout_tests/controllers/manager.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-12  Dirk Pranke  <dpranke@chromium.org>
+
+        webkitpy: rename manager_worker_broker to message_pool
+        https://bugs.webkit.org/show_bug.cgi?id=91145
+
+        Reviewed by Ojan Vafai.
+
+        Since the MessagePool interface is more generic (and simpler)
+        now and will be reused by test-webkitpy, I'm renaming it and
+        moving it to webkitpy.common.
+
+        * Scripts/webkitpy/common/message_pool.py: Renamed from Tools/Scripts/webkitpy/layout_tests/controllers/manager_worker_broker.py.
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (TestRunInterruptedException.__reduce__):
+        (Manager._run_tests.worker_factory):
+        (Manager._run_tests):
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+
 2012-07-12  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/common/message_pool.py

@@ -27 +27 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-"""Module for handling messages and concurrency for run-webkit-tests."""
+"""Module for handling messages and concurrency for run-webkit-tests
+and test-webkitpy. This module follows the design for multiprocessing.Pool
+and concurrency.futures.ProcessPoolExecutor, with the following differences:
+
+* Tasks are executed in stateful subprocesses via objects that implement the
+  Worker interface - this allows the workers to share state across tasks.
+* The pool provides an asynchronous event-handling interface so the caller
+  may receive events as tasks are processed.
+
+If you don't need these features, use multiprocessing.Pool or concurrency.futures
+intead.
+
+"""
 
 import cPickle
@@ -40 +52 @@
 from webkitpy.common.host import Host
 from webkitpy.common.system import stack_utils
-from webkitpy.layout_tests.views import metered_stream
 
 
@@ -282 +293 @@
         for h in self._logger.handlers:
             # log handlers don't have names until python 2.7.
-            # FIXME: get webkitpy.test.printer from a constant as well.
-            if getattr(h, 'name', '') in (metered_stream.LOG_HANDLER_NAME, 'webkitpy.test.printer'):
+            # FIXME: log handler names should be passed in.
+            if getattr(h, 'name', '') in ('MeteredStreamLogHandler', 'webkitpy.test.printer'):
                 self._logger.removeHandler(h)
                 break

trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

@@ -45 +45 @@
 import time
 
-from webkitpy.layout_tests.controllers import manager_worker_broker
+from webkitpy.common import message_pool
 from webkitpy.layout_tests.controllers import worker
 from webkitpy.layout_tests.controllers.test_result_writer import TestResultWriter
@@ -265 +265 @@
 
 
-# Export this so callers don't need to know about manager_worker_broker.
-WorkerException = manager_worker_broker.WorkerException
+# Export this so callers don't need to know about message pools.
+WorkerException = message_pool.WorkerException
 
 
@@ -768 +768 @@
             return worker.Worker(worker_connection, self.results_directory(), self._options)
 
-        manager_connection = manager_worker_broker.get(num_workers, self, worker_factory, self._port.host)
-
         if self._options.dry_run:
             return (keyboard_interrupted, interrupted, self._worker_stats.values(), self._group_stats, self._all_results)
@@ -776 +774 @@
 
         try:
-            with manager_worker_broker.get(self, worker_factory, num_workers, self._port.worker_startup_delay_secs(), self._port.host) as pool:
+            with message_pool.get(self, worker_factory, num_workers, self._port.worker_startup_delay_secs(), self._port.host) as pool:
                 pool.run(('test_list', shard.name, shard.test_inputs) for shard in all_shards)
         except KeyboardInterrupt:

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

@@ -52 +52 @@
 from webkitpy.layout_tests import port
 from webkitpy.layout_tests import run_webkit_tests
-from webkitpy.layout_tests.controllers.manager_worker_broker import WorkerException
+from webkitpy.layout_tests.controllers.manager import WorkerException
 from webkitpy.layout_tests.port import Port
 from webkitpy.layout_tests.port.test import TestPort, TestDriver