Make TimeoutRetryThread's stoppable

build/android/pylib/utils/timeout_retry.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.
 
 """A utility to run functions with timeouts and retries."""
 # pylint: disable=W0702
 
 import threading
 
 from pylib.utils import reraiser_thread
@@ skipping 24 matching lines @@
 
   # The return value uses a list because Python variables are references, not
   # values. Closures make a copy of the reference, so updating the closure's
   # reference wouldn't update where the original reference pointed.
   ret = [None]
   def RunOnTimeoutThread():
     ret[0] = func(*args, **kwargs)
 
   while True:
     try:
-      name = 'TimeoutThread-for-%s' % threading.current_thread().name
+      name = 'TimeoutThread-%d-for-%s' % (retries,

[jbudorick, 2014/10/24 17:30:52]

Good idea.

+                                          threading.current_thread().name)
       thread_group = reraiser_thread.ReraiserThreadGroup(
           [TimeoutRetryThread(RunOnTimeoutThread, name=name)])
       thread_group.StartAll()
       thread_group.JoinAll(watchdog_timer.WatchdogTimer(timeout))
       return ret[0]
     except:
       if retries <= 0:
         raise
       retries -= 1