build/android/devil/android/decorators.py - Issue 1376473006: Associate threads in reraiser_thread.RunAsync with the calling ThreadGroup

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/devil/android/decorators.py

Issue 1376473006: Associate threads in reraiser_thread.RunAsync with the calling ThreadGroup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase due to patch failure on win bot Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/android/devil/android/decorators.py

diff --git a/build/android/devil/android/decorators.py b/build/android/devil/android/decorators.py

index c90532f95d7375d51f6fbeb05acc3cbfa208aae7..b263790b709b91dc827f5adcce523a92ff9b12fc 100644

--- a/build/android/devil/android/decorators.py

+++ b/build/android/devil/android/decorators.py

@@ -9,7 +9,6 @@ Function/method decorators that provide timeout and retry logic.

import functools

import itertools

import sys

-import threading

from devil.android import device_errors

from devil.utils import cmd_helper

@@ -44,8 +43,8 @@ def _TimeoutRetryWrapper(f, timeout_func, retries_func, pass_values=False):

def impl():

return f(*args, **kwargs)

try:

- if isinstance(threading.current_thread(),

- timeout_retry.TimeoutRetryThread):

+ if timeout_retry.CurrentTimeoutThreadGroup():

+ # Don't wrap if there's already an outer timeout thread.

return impl()

else:

desc = '%s(%s)' % (f.__name__, ', '.join(itertools.chain(

« no previous file with comments | « build/android/PRESUBMIT.py ('k') | build/android/devil/android/sdk/adb_wrapper.py » ('j') | no next file with comments »