tools/telemetry/telemetry/core/platform/profiler/v8_profiler.py - Issue 1233643004: Revert of [Android] Remove adb_commands from telemetry. (Reland)

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: tools/telemetry/telemetry/core/platform/profiler/v8_profiler.py

Issue 1233643004: Revert of [Android] Remove adb_commands from telemetry. (Reland) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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

« no previous file with comments | « tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py ('k') | tools/telemetry/telemetry/core/platform/profiler/vtune_profiler.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/platform/profiler/v8_profiler.py

diff --git a/tools/telemetry/telemetry/core/platform/profiler/v8_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/v8_profiler.py

index ef065be3c4f10a2041f31802e2d12efa44a8d3f0..34bc476214b147d68383247b0284cb7701dec30c 100644

--- a/tools/telemetry/telemetry/core/platform/profiler/v8_profiler.py

+++ b/tools/telemetry/telemetry/core/platform/profiler/v8_profiler.py

@@ -2,6 +2,7 @@

# Use of this source code is governed by a BSD-style license that can be

# found in the LICENSE file.

+import logging

import re

import tempfile

@@ -38,9 +39,14 @@

# On Android pull the output file to the host.

if self._platform_backend.GetOSName() == 'android':

host_output_file = '%s.log' % self._output_path

- self._browser_backend.device.PullFile(output_file, host_output_file)

+ try:

+ self._browser_backend.adb.device().PullFile(

+ output_file, host_output_file)

+ except:

+ logging.exception('New exception caused by DeviceUtils conversion')

+ raise

# Clean the device

- self._browser_backend.device.RunShellCommand('rm %s' % output_file)

+ self._browser_backend.adb.device().RunShellCommand('rm %s' % output_file)

output_file = host_output_file

print 'V8 profile saved as %s' % output_file

print 'To view, open in ' \