[Android] Thread names reflect the device serial number they are associated with.

build/android/pylib/utils/reraiser_thread.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Thread and ThreadGroup that reraise exceptions on the main thread."""
 
 import logging
 import sys
 import threading
 import time
 import traceback
 
 import watchdog_timer
 
 
 class TimeoutError(Exception):
   """Module-specific timeout exception."""
   pass
 
 
 class ReraiserThread(threading.Thread):
   """Thread class that can reraise exceptions."""
 
-  def __init__(self, func, args=[], kwargs={}):
-    super(ReraiserThread, self).__init__()
+  def __init__(self, func, args=[], kwargs={}, name=None):
+    """Initialize thread.
+
+    Args:
+      func: callable to call on a new thread.
+      args: list of positional arguments for callable, defaults to empty.
+      kwargs: dictionary of keyword arguments for callable, defaults to empty.
+      name: thread name, defaults to Thread-N.
+    """
+    super(ReraiserThread, self).__init__(name=name)
     self.daemon = True
     self._func = func
     self._args = args
     self._kwargs = kwargs
     self._exc_info = None
 
   def ReraiseIfException(self):
     """Reraise exception if an exception was raised in the thread."""
     if self._exc_info:
       raise self._exc_info[0], self._exc_info[1], self._exc_info[2]
@@ skipping 61 matching lines @@
     Reraises exceptions raised by the child threads and supports breaking
     immediately on exceptions raised on the main thread. Unfinished threads'
     stacks will be logged on watchdog timeout.
 
     Args:
       watcher: Watchdog object providing timeout, by default waits forever.
     """
     try:
       self._JoinAll(watcher)
     except TimeoutError:
-      alive_thread_ids = (t.ident for t in self._threads if t.isAlive())
-      for thread_id in alive_thread_ids:
-        stack = sys._current_frames()[thread_id]
+      for thread in (t for t in self._threads if t.isAlive()):
+        stack = sys._current_frames()[thread.ident]
         logging.critical('*' * 80)
-        logging.critical('Stack dump for timed out ThreadId = %s', thread_id)
+        logging.critical('Stack dump for timed out thread \'%s\'', thread.name)
         logging.critical('*' * 80)
         for filename, lineno, name, line in traceback.extract_stack(stack):
           logging.critical('File: "%s", line %d, in %s', filename, lineno, name)
           if line:
             logging.critical('  %s', line.strip())
         logging.critical('*' * 80)
       raise