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

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

Issue 1252923003: Revert of [Android][Telemetry] Add support for multiple power monitors (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
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 07a76dcb646b7542143316a716008c5aedf41871..31c98180e4bb16676db1aec65476961bef003725 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
@@ -18,28 +18,27 @@
"""
def __init__(self, power_monitors, battery):
super(PowerMonitorController, self).__init__()
- self._candidate_power_monitors = power_monitors
- self._active_monitors = []
+ self._cascading_power_monitors = power_monitors
+ self._active_monitor = None
self._battery = battery
atexit.register(_ReenableChargingIfNeeded, self._battery)
+ def _AsyncPowerMonitor(self):
+ return next(
+ (x for x in self._cascading_power_monitors if x.CanMonitorPower()),
+ None)
+
def CanMonitorPower(self):
- return any(m.CanMonitorPower() for m in self._candidate_power_monitors)
+ return bool(self._AsyncPowerMonitor())
def StartMonitoringPower(self, browser):
- assert not self._active_monitors, 'Must call StopMonitoringPower().'
- self._active_monitors = (
- [m for m in self._candidate_power_monitors if m.CanMonitorPower()])
- assert self._active_monitors, 'No available monitor.'
- for monitor in self._active_monitors:
- monitor.StartMonitoringPower(browser)
+ self._active_monitor = self._AsyncPowerMonitor()
+ assert self._active_monitor, 'No available monitor.'
+ self._active_monitor.StartMonitoringPower(browser)
def StopMonitoringPower(self):
- assert self._active_monitors, 'StartMonitoringPower() not called.'
+ assert self._active_monitor, 'StartMonitoringPower() not called.'
try:
- results = {}
- for monitor in self._active_monitors:
- results.update(monitor.StopMonitoringPower())
- return results
+ return self._active_monitor.StopMonitoringPower()
finally:
- self._active_monitors = []
+ self._active_monitor = None

Powered by Google App Engine
This is Rietveld 408576698