[Android] Log once per minute while waiting for timeout_retry thread completion.

build/android/devil/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 logging
 import threading
 import time
@@ skipping 67 matching lines @@
   current_thread = threading.current_thread()
   if isinstance(current_thread, TimeoutRetryThread):
     return current_thread
   else:
     return None
 
 
 def WaitFor(condition, wait_period=5, max_tries=None):
   """Wait for a condition to become true.
 
-  Repeadly call the function condition(), with no arguments, until it returns
+  Repeatedly call the function condition(), with no arguments, until it returns
   a true value.
 
   If called within a TimeoutRetryThread, it cooperates nicely with it.
 
   Args:
     condition: function with the condition to check
     wait_period: number of seconds to wait before retrying to check the
       condition
     max_tries: maximum number of checks to make, the default tries forever
       or until the TimeoutRetryThread expires.
@@ skipping 20 matching lines @@
     if result:
       return result
     if timeout_thread:
       # pylint: disable=no-member
       timeout_thread.GetRemainingTime(wait_period,
           msg='Timed out waiting for %r' % condition_name)
     time.sleep(wait_period)
   return None
 
 
-def Run(func, timeout, retries, args=None, kwargs=None):
+def Run(func, timeout, retries, args=None, kwargs=None, desc=None):
   """Runs the passed function in a separate thread with timeouts and retries.
 
   Args:
     func: the function to be wrapped.
     timeout: the timeout in seconds for each try.
     retries: the number of retries.
     args: list of positional args to pass to |func|.
     kwargs: dictionary of keyword args to pass to |func|.
+    desc: An optional description of |func| used in logging. If omitted,
+      |func.__name__| will be used.
 
   Returns:
     The return value of func(*args, **kwargs).
   """
   if not args:
     args = []
   if not kwargs:
     kwargs = {}
 
   # 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)
 
   num_try = 1
   while True:
     child_thread = TimeoutRetryThread(
       RunOnTimeoutThread, timeout,
       name='TimeoutThread-%d-for-%s' % (num_try,
                                         threading.current_thread().name))
     try:
       thread_group = reraiser_thread.ReraiserThreadGroup([child_thread])
       thread_group.StartAll()
-      thread_group.JoinAll(child_thread.GetWatcher())
-      return ret[0]
+      while True:
+        thread_group.JoinAll(watcher=child_thread.GetWatcher(), timeout=60)
+        if thread_group.IsAlive():
+          logging.info('Still working on %s', desc if desc else func.__name__)
+        else:
+          return ret[0]
     except:
       child_thread.LogTimeoutException()
       if num_try > retries:
         raise
       num_try += 1