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

Unified Diff: tools/telemetry/telemetry/internal/platform/power_monitor/power_monitor_controller.py

Issue 1432093002: Improve readability of power monitoring code and add additional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix issue 556653 Created 5 years, 1 month 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/internal/platform/power_monitor/power_monitor_controller.py
diff --git a/tools/telemetry/telemetry/internal/platform/power_monitor/power_monitor_controller.py b/tools/telemetry/telemetry/internal/platform/power_monitor/power_monitor_controller.py
index 7c5aefd799a41483899a52751db00dd8dea32a60..5b42c5eab67f8780813a0314761e532b635b5c8b 100644
--- a/tools/telemetry/telemetry/internal/platform/power_monitor/power_monitor_controller.py
+++ b/tools/telemetry/telemetry/internal/platform/power_monitor/power_monitor_controller.py
@@ -34,7 +34,7 @@ class PowerMonitorController(power_monitor.PowerMonitor):
logging.warning('StopMonitoringPower() not called when expected. Last '
'results are likely not reported.')
self.StopMonitoringPower()
-
+ self._CheckStart()
self._active_monitors = (
[m for m in self._candidate_power_monitors if m.CanMonitorPower()])
assert self._active_monitors, 'No available monitor.'
@@ -51,14 +51,14 @@ class PowerMonitorController(power_monitor.PowerMonitor):
for key in dict_one:
if key in dict_two and key not in ignore_list:
logging.warning('Found multiple instances of %s in power monitor '
- 'enteries. Using newest one.', key)
- # Sub level power enteries.
+ 'entries. Using newest one.', key)
+ # Sub level power entries.
for part in ['platform_info', 'component_utilization']:
if part in monitor_results:
_CheckDuplicateKeys(combined_results[part], monitor_results[part])
combined_results[part].update(monitor_results[part])
- # Top level power enteries.
+ # Top level power entries.
platform_info = combined_results['platform_info'].copy()
comp_utilization = combined_results['component_utilization'].copy()
_CheckDuplicateKeys(
@@ -69,7 +69,7 @@ class PowerMonitorController(power_monitor.PowerMonitor):
combined_results['component_utilization'] = comp_utilization
def StopMonitoringPower(self):
- assert self._active_monitors, 'StartMonitoringPower() not called.'
+ self._CheckStop()
try:
results = {'platform_info': {}, 'component_utilization': {}}
for monitor in self._active_monitors:

Powered by Google App Engine
This is Rietveld 408576698