summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-13 17:06:24 +0000
committerbulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-13 17:06:24 +0000
commitf661bb53f2baf0f52c83e5c3f82efab6b9fc053b (patch)
treed8f9a3c1c52b9d3ba1fdda6659891ec25b467db1
parent9bfd8727ff93b1d9528fb1216480f5f848139e54 (diff)
downloadchromium_src-f661bb53f2baf0f52c83e5c3f82efab6b9fc053b.zip
chromium_src-f661bb53f2baf0f52c83e5c3f82efab6b9fc053b.tar.gz
chromium_src-f661bb53f2baf0f52c83e5c3f82efab6b9fc053b.tar.bz2
Android / Telemetry: uses taskset for adb
Workaround for crbug.com/268450. Perf sheriffs: this patch may generate some noise, specially in page_cyclers load time. BUG=268450 Review URL: https://chromiumcodereview.appspot.com/22887003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217278 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--tools/telemetry/telemetry/core/chrome/android_browser_finder.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/telemetry/telemetry/core/chrome/android_browser_finder.py b/tools/telemetry/telemetry/core/chrome/android_browser_finder.py
index 86a942f..d3a7bdc 100644
--- a/tools/telemetry/telemetry/core/chrome/android_browser_finder.py
+++ b/tools/telemetry/telemetry/core/chrome/android_browser_finder.py
@@ -101,6 +101,17 @@ def CanFindAvailableBrowsers(logging=real_logging):
adb_works = True
else:
adb_works = False
+ if adb_works and sys.platform.startswith('linux'):
+ # Workaround for crbug.com/268450
+ import psutil
+ adb_commands.GetAttachedDevices()
+ pids = [p.pid for p in psutil.process_iter() if 'adb' in p.name]
+ with open(os.devnull, 'w') as devnull:
+ for pid in pids:
+ subprocess.check_call(['taskset', '-p', '0x1', str(pid)],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ stdin=devnull)
return adb_works