tools/profile_chrome/perf_controller.py - Issue 404993004: [Android] Switch to DeviceUtils versions of GetMemoryUsageForPid and __str__.

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/profile_chrome/perf_controller.py

Issue 404993004: [Android] Switch to DeviceUtils versions of GetMemoryUsageForPid and __str__. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comment from frankf Created 6 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/memory_inspector/memory_inspector/backends/android/android_backend.py ('k') | tools/profile_chrome/systrace_controller.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/profile_chrome/perf_controller.py

diff --git a/tools/profile_chrome/perf_controller.py b/tools/profile_chrome/perf_controller.py

index 245435ee85d379532af04c277b82262840f3dd21..6a3b92076bef9cc12d74b1a3aa9b16f364cc8c5a 100644

--- a/tools/profile_chrome/perf_controller.py

+++ b/tools/profile_chrome/perf_controller.py

@@ -50,8 +50,9 @@ class _PerfProfiler(object):

self._device.old_interface, prefix='perf_output')

self._log_file = tempfile.TemporaryFile()

- device_param = (['-s', self._device.old_interface.GetDevice()]

- if self._device.old_interface.GetDevice() else [])

+ # TODO(jbudorick) Look at providing a way to unhandroll this once the

+ # adb rewrite has fully landed.

+ device_param = (['-s', str(self._device)] if str(self._device) else [])

cmd = ['adb'] + device_param + \

['shell', perf_binary, 'record',

'--output', self._output_file.name] + _PERF_OPTIONS