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

Unified Diff: tools/telemetry/telemetry/core/platform/power_monitor/powermetrics_power_monitor.py

Issue 720413006: [Telemetry] Improve elevate_privilege handling in LaunchApplication() + Fix killing of power metri… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comment fix Created 6 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
« no previous file with comments | « tools/telemetry/telemetry/core/platform/posix_platform_backend.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/platform/power_monitor/powermetrics_power_monitor.py
diff --git a/tools/telemetry/telemetry/core/platform/power_monitor/powermetrics_power_monitor.py b/tools/telemetry/telemetry/core/platform/power_monitor/powermetrics_power_monitor.py
index badbdb0268c9739da9ba8832da42b4d9c8245ee3..abb6fe9eebf3809ba827b562a2c613061243a2bb 100644
--- a/tools/telemetry/telemetry/core/platform/power_monitor/powermetrics_power_monitor.py
+++ b/tools/telemetry/telemetry/core/platform/power_monitor/powermetrics_power_monitor.py
@@ -228,12 +228,23 @@ class PowerMetricsPowerMonitor(power_monitor.PowerMonitor):
StoreMetricAverage(m, sample_durations, out_dict)
return out_dict
+ def _KillPowerMetricsProcess(self):
+ """Kill a running powermetrics process."""
+ try:
+ self._powermetrics_process.terminate()
+ except OSError:
+ # terminate() can fail when Powermetrics does not have the SetUID set.
+ self._backend.LaunchApplication(
+ '/usr/bin/pkill',
+ ['-SIGTERM', os.path.basename(self.binary_path)],
+ elevate_privilege=True)
+
def StopMonitoringPower(self):
assert self._powermetrics_process, (
'StartMonitoringPower() not called.')
# Tell powermetrics to take an immediate sample.
try:
- self._powermetrics_process.terminate()
+ self._KillPowerMetricsProcess()
(power_stdout, power_stderr) = self._powermetrics_process.communicate()
returncode = self._powermetrics_process.returncode
assert returncode in [0, -15], (
« no previous file with comments | « tools/telemetry/telemetry/core/platform/posix_platform_backend.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698