Changeset 78159 in webkit

Timestamp:

Feb 9, 2011 4:09:34 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

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

Reviewed by Tony Chang.

nrwt multiprocessing: minor cleanup prior to implementing the new worker

This patch renames AbstractManager to ManagerConnection and
changes some argument names to be more consistent between
manager_worker_broker and message_broker. It also fixes a couple
of typos in message_broker. These changes will be tested by code
introduced in the next patch.

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

• Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py:
• Scripts/webkitpy/layout_tests/layout_package/message_broker2.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py (modified) (5 diffs)
• Scripts/webkitpy/layout_tests/layout_package/message_broker2.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-02-09  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        nrwt multiprocessing: minor cleanup prior to implementing the new worker
+
+        This patch renames AbstractManager to ManagerConnection and
+        changes some argument names to be more consistent between
+        manager_worker_broker and message_broker. It also fixes a couple
+        of typos in message_broker. These changes will be tested by code
+        introduced in the next patch.
+       
+        https://bugs.webkit.org/show_bug.cgi?id=54067
+
+        * Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py:
+        * Scripts/webkitpy/layout_tests/layout_package/message_broker2.py:
+
 2011-02-09  Anders Carlsson  <andersca@apple.com>
 

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

@@ -78 +78 @@
 
 
-def get(port, options, manager, worker_class):
+def get(port, options, client, worker_class):
     """Return a connection to a manager/worker message_broker
 
@@ -84 +84 @@
         port - handle to layout_tests/port object for port-specific stuff
         options - optparse argument for command-line options
-        manager - object to dispatch replies to
+        client - object to dispatch replies to
         worker_class - type of workers to create. This class must implement
             the methods in AbstractWorker.
@@ -106 +106 @@
 
     broker = message_broker2.Broker(options, queue_class)
-    return manager_class(broker, port, options, manager, worker_class)
+    return manager_class(broker, port, options, client, worker_class)
 
 
@@ -137 +137 @@
 
 
-class _AbstractManager(object):
-    def __init__(self, broker, port, options, manager, worker_class):
+class _ManagerConnection(message_broker2.BrokerConnection):
+    def __init__(self, broker, port, options, client, worker_class):
         """Base initialization for all Manager objects.
 
@@ -145 +145 @@
             port: handle to port-specific functionality
             options: command line options object
-            manager: Manager callback object (the caller)
+            client: callback object (the caller)
             worker_class: class object to use to create workers.
         """
-        self._broker = broker
+        message_broker2.BrokerConnection.__init__(self, broker, client,
+            MANAGER_TOPIC, ANY_WORKER_TOPIC)
         self._options = options
-        self._manager = manager
         self._worker_class = worker_class
 
 
-class _InlineManager(_AbstractManager):
+class _InlineManager(_ManagerConnection):
     pass
 
 
-class _ThreadedManager(_AbstractManager):
+class _ThreadedManager(_ManagerConnection):
     pass
 
 
-class _MultiProcessManager(_AbstractManager):
+class _MultiProcessManager(_ManagerConnection):
     pass

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

@@ -133 +133 @@
 
     def _run_loop(self, topic_name, client, block, delay_secs):
-        queue = self._find_topic(topic_name)
+        queue = self._get_queue_for_topic(topic_name)
         while not client.is_done():
             try:
@@ -147 +147 @@
                "%s: received message '%s' it couldn't handle" %
                (client.name(), message.name))
-        optargs = message.body
+        optargs = message.args
         message_handler = getattr(client, 'handle_' + message.name)
         message_handler(message.src, *optargs)