2010-11-24 Dirk Pranke <dpranke@chromium.org>

[WebKit.git] / WebKitTools / Scripts / webkitpy / layout_tests / layout_package / dump_render_tree_thread.py

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
index 1bac7ef18e3e2ea7a6dcf5fa37402678e7ae2a2b..38cf6c352377b396c0c9591e7a5b5b9745d7a87a 100644 (file)
--- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
@@ -244,7 +244,7 @@ class WatchableThread(threading.Thread):
 
 
 class TestShellThread(WatchableThread):
 
 
 class TestShellThread(WatchableThread):

-    def __init__(self, port, options, worker_number,
+    def __init__(self, port, options, worker_number, worker_name,

                  filename_list_queue, result_queue):
         """Initialize all the local state for this DumpRenderTree thread.
 
                  filename_list_queue, result_queue):
         """Initialize all the local state for this DumpRenderTree thread.
 


@@ -252,6 +252,7 @@ class TestShellThread(WatchableThread):
           port: interface to port-specific hooks
           options: command line options argument from optparse
           worker_number: identifier for a particular worker thread.
           port: interface to port-specific hooks
           options: command line options argument from optparse
           worker_number: identifier for a particular worker thread.

+          worker_name: for logging.

           filename_list_queue: A thread safe Queue class that contains lists
               of tuples of (filename, uri) pairs.
           result_queue: A thread safe Queue class that will contain
           filename_list_queue: A thread safe Queue class that contains lists
               of tuples of (filename, uri) pairs.
           result_queue: A thread safe Queue class that will contain


@@ -261,7 +262,7 @@ class TestShellThread(WatchableThread):
         self._port = port
         self._options = options
         self._worker_number = worker_number
         self._port = port
         self._options = options
         self._worker_number = worker_number

-        self._name = 'worker-%d' % worker_number
+        self._name = worker_name

         self._filename_list_queue = filename_list_queue
         self._result_queue = result_queue
         self._filename_list = []
         self._filename_list_queue = filename_list_queue
         self._result_queue = result_queue
         self._filename_list = []