Changeset 77994 in webkit

Timestamp:

Feb 8, 2011 4:48:35 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

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

Reviewed by Mihai Parparita.

new-run-webkit-tests: split out thread stack logging code into a sharable module

This patch splits out the code used to find and log thread
stacks from NRWT-specific packages to something generic and
shareable by other python modules. It will be shared in the near
future by the manager_worker_broker module, for example.

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

• Scripts/webkitpy/common/system/stack_utils.py: Added.
• Scripts/webkitpy/common/system/stack_utils_unittest.py: Added.
• Scripts/webkitpy/layout_tests/layout_package/message_broker.py:
• Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/stack_utils.py (added)
• Scripts/webkitpy/common/system/stack_utils_unittest.py (added)
• Scripts/webkitpy/layout_tests/layout_package/message_broker.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-02-08  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Mihai Parparita.
+
+        new-run-webkit-tests: split out thread stack logging code into a sharable module
+
+        This patch splits out the code used to find and log thread
+        stacks from NRWT-specific packages to something generic and
+        shareable by other python modules. It will be shared in the near
+        future by the manager_worker_broker module, for example.
+
+        https://bugs.webkit.org/show_bug.cgi?id=53656
+
+        * Scripts/webkitpy/common/system/stack_utils.py: Added.
+        * Scripts/webkitpy/common/system/stack_utils_unittest.py: Added.
+        * Scripts/webkitpy/layout_tests/layout_package/message_broker.py:
+        * Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py:
+
 2011-02-08  Dirk Pranke  <dpranke@chromium.org>
 

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

@@ -42 +42 @@
 
 import logging
-import sys
 import time
-import traceback
+
+from webkitpy.common.system import stack_utils
 
 import dump_render_tree_thread
@@ -153 +153 @@
                     next_timeout = thread.next_timeout()
                     if next_timeout and t > next_timeout:
-                        log_wedged_worker(thread.getName(), thread.id())
+                        stack_utils.log_thread_state(_log.error, thread.getName(), thread.id(), "is wedged")
                         thread.clear_next_timeout()
                         wedged_threads.add(thread)
@@ -177 +177 @@
         for thread in threads:
             thread.cancel()
-
-
-def log_wedged_worker(name, id):
-    """Log information about the given worker state."""
-    stack = _find_thread_stack(id)
-    assert(stack is not None)
-    _log.error("")
-    _log.error("%s (tid %d) is wedged" % (name, id))
-    _log_stack(stack)
-    _log.error("")
-
-
-def _find_thread_stack(id):
-    """Returns a stack object that can be used to dump a stack trace for
-    the given thread id (or None if the id is not found)."""
-    for thread_id, stack in sys._current_frames().items():
-        if thread_id == id:
-            return stack
-    return None
-
-
-def _log_stack(stack):
-    """Log a stack trace to log.error()."""
-    for filename, lineno, name, line in traceback.extract_stack(stack):
-        _log.error('File: "%s", line %d, in %s' % (filename, lineno, name))
-        if line:
-            _log.error('  %s' % line.strip())

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

@@ -91 +91 @@
         self._next_timeout = None
 
-
 class TestHandler(logging.Handler):
     def __init__(self, astream):
@@ -158 +157 @@
         self.assertRaises(ValueError, self.run_one_thread, 'Exception')
 
-    def test_find_thread_stack_found(self):
-        id, stack = sys._current_frames().items()[0]
-        found_stack = message_broker._find_thread_stack(id)
-        self.assertNotEqual(found_stack, None)
-
-    def test_find_thread_stack_not_found(self):
-        found_stack = message_broker._find_thread_stack(0)
-        self.assertEqual(found_stack, None)
-
 
 if __name__ == '__main__':