Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Unified Diff: tools/telemetry/telemetry/core/platform/profiler/perf_profiler.py

Issue 1145153005: Revert of [Android] Remove adb_commands from telemetry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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: tools/telemetry/telemetry/core/platform/profiler/perf_profiler.py
diff --git a/tools/telemetry/telemetry/core/platform/profiler/perf_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/perf_profiler.py
index 159bf7a4af1686712fa63b0135e5e2e2568d6104..f0982e6bf8d53fd5e2c34f76d7cd012c8867bb18 100644
--- a/tools/telemetry/telemetry/core/platform/profiler/perf_profiler.py
+++ b/tools/telemetry/telemetry/core/platform/profiler/perf_profiler.py
@@ -80,16 +80,15 @@
cmd_prefix = []
perf_args = ['record', '--pid', str(pid)]
if self._is_android:
- cmd_prefix = ['adb', '-s', browser_backend.device.adb.GetDeviceSerial(),
- 'shell', perf_binary]
+ cmd_prefix = ['adb', '-s', browser_backend.adb.device_serial(), 'shell',
+ perf_binary]
perf_args += _PERF_OPTIONS_ANDROID
output_file = os.path.join('/sdcard', 'perf_profiles',
os.path.basename(output_file))
self._device_output_file = output_file
- browser_backend.device.RunShellCommand(
+ browser_backend.adb.RunShellCommand(
'mkdir -p ' + os.path.dirname(self._device_output_file))
- browser_backend.device.RunShellCommand(
- 'rm -f ' + self._device_output_file)
+ browser_backend.adb.RunShellCommand('rm -f ' + self._device_output_file)
else:
cmd_prefix = [perf_binary]
perf_args += ['--output', output_file] + _PERF_OPTIONS
@@ -104,10 +103,10 @@
'To collect a full profile rerun with '
'"--extra-browser-args=--single-process"')
if self._is_android:
+ device = self._browser_backend.adb.device()
try:
binary_name = os.path.basename(self._perf_binary)
- self._browser_backend.device.KillAll(
- binary_name, signum=signal.SIGINT, blocking=True)
+ device.KillAll(binary_name, signum=signal.SIGINT, blocking=True)
except device_errors.CommandFailedError:
logging.warning('The perf process could not be killed on the device.')
self._proc.send_signal(signal.SIGINT)
@@ -128,15 +127,16 @@
cmd = '%s report -n -i %s' % (_NicePath(self._perfhost_binary),
self._output_file)
if self._is_android:
- self._browser_backend.device.PullFile(
- self._device_output_file, self._output_file)
- required_libs = (
+ device = self._browser_backend.adb.device()
+ device.PullFile(self._device_output_file, self._output_file)
+ required_libs = \
android_profiling_helper.GetRequiredLibrariesForPerfProfile(
- self._output_file))
+ self._output_file)
symfs_root = os.path.dirname(self._output_file)
- kallsyms = android_profiling_helper.CreateSymFs(
- self._browser_backend.device, symfs_root, required_libs,
- use_symlinks=True)
+ kallsyms = android_profiling_helper.CreateSymFs(device,
+ symfs_root,
+ required_libs,
+ use_symlinks=True)
cmd += ' --symfs %s --kallsyms %s' % (symfs_root, kallsyms)
for lib in required_libs:
lib = os.path.join(symfs_root, lib[1:])
@@ -173,10 +173,9 @@
perf_binary = perfhost_binary = _InstallPerfHost()
try:
if platform_backend.GetOSName() == 'android':
- perf_binary = android_profiling_helper.PrepareDeviceForPerf(
- browser_backend.device)
- self._perf_control = perf_control.PerfControl(
- browser_backend.device)
+ device = browser_backend.adb.device()
+ perf_binary = android_profiling_helper.PrepareDeviceForPerf(device)
+ self._perf_control = perf_control.PerfControl(device)
self._perf_control.SetPerfProfilingMode()
else:
_PrepareHostForPerf()

Powered by Google App Engine
This is Rietveld 408576698