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

Unified Diff: build/android/pylib/perf/perf_control.py

Issue 221823011: [Android] Change object types from AndroidCommands to DeviceUtils in build/android/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 8 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 | « build/android/pylib/perf/cache_control.py ('k') | build/android/pylib/perf/surface_stats_collector.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/perf/perf_control.py
diff --git a/build/android/pylib/perf/perf_control.py b/build/android/pylib/perf/perf_control.py
index e289991f84abd918780ce520db4467e3ceb5ec64..92aaa2433012499b4b78ab5682b557fc69eae604 100644
--- a/build/android/pylib/perf/perf_control.py
+++ b/build/android/pylib/perf/perf_control.py
@@ -4,6 +4,8 @@
import logging
+from pylib import android_commands
+from pylib.device import device_utils
class PerfControl(object):
@@ -12,16 +14,20 @@ class PerfControl(object):
'/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor')
_KERNEL_MAX = '/sys/devices/system/cpu/kernel_max'
- def __init__(self, adb):
- self._adb = adb
- kernel_max = self._adb.GetFileContents(PerfControl._KERNEL_MAX,
- log_result=False)
+ def __init__(self, device):
+ # TODO(jbudorick) Remove once telemetry gets switched over.
+ if isinstance(device, android_commands.AndroidCommands):
+ device = device_utils.DeviceUtils(device)
+ self._device = device
+ kernel_max = self._device.old_interface.GetFileContents(
+ PerfControl._KERNEL_MAX, log_result=False)
assert kernel_max, 'Unable to find %s' % PerfControl._KERNEL_MAX
self._kernel_max = int(kernel_max[0])
logging.info('Maximum CPU index: %d', self._kernel_max)
- self._original_scaling_governor = self._adb.GetFileContents(
- PerfControl._SCALING_GOVERNOR_FMT % 0,
- log_result=False)[0]
+ self._original_scaling_governor = \
+ self._device.old_interface.GetFileContents(
+ PerfControl._SCALING_GOVERNOR_FMT % 0,
+ log_result=False)[0]
def SetHighPerfMode(self):
"""Sets the highest possible performance mode for the device."""
@@ -29,7 +35,7 @@ class PerfControl(object):
def SetDefaultPerfMode(self):
"""Sets the performance mode for the device to its default mode."""
- product_model = self._adb.GetProductModel()
+ product_model = self._device.old_interface.GetProductModel()
governor_mode = {
'GT-I9300': 'pegasusq',
'Galaxy Nexus': 'interactive',
@@ -46,7 +52,9 @@ class PerfControl(object):
def _SetScalingGovernorInternal(self, value):
for cpu in range(self._kernel_max + 1):
scaling_governor_file = PerfControl._SCALING_GOVERNOR_FMT % cpu
- if self._adb.FileExistsOnDevice(scaling_governor_file):
+ if self._device.old_interface.FileExistsOnDevice(scaling_governor_file):
logging.info('Writing scaling governor mode \'%s\' -> %s',
value, scaling_governor_file)
- self._adb.SetProtectedFileContents(scaling_governor_file, value)
+ self._device.old_interface.SetProtectedFileContents(
+ scaling_governor_file, value)
+
« no previous file with comments | « build/android/pylib/perf/cache_control.py ('k') | build/android/pylib/perf/surface_stats_collector.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698