From aab9ab0915aa3467937556677e42272e5385cfc0 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Mon, 18 Dec 2023 16:31:06 +0100 Subject: [PATCH 1/2] refactor: use ProcessBuilder for power command --- .../sensors/macos/powermetrics/MacOSPowermetricsSensor.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java b/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java index 51f2fa9e..34bf7e1e 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java +++ b/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java @@ -237,10 +237,7 @@ public void start(long frequency) throws Exception { if (!isStarted()) { // it takes some time for the external process in addition to the sampling time so adjust the sampling frequency to account for this so that at most one measure occurs during the sampling time window final var freq = Long.toString(frequency - 50); -// powermetrics = new ProcessBuilder().command("sudo", "powermetrics", "--samplers cpu_power,tasks", "--show-process-samp-norm", "--show-process-gpu", "-i " + freq).start(); // for some reason this doesn't work - powermetrics = Runtime.getRuntime() - .exec("sudo powermetrics --samplers cpu_power,tasks --show-process-samp-norm --show-process-gpu -i " + freq); - + powermetrics = new ProcessBuilder().command("sudo", "powermetrics", "--samplers", "cpu_power,tasks", "--show-process-samp-norm", "--show-process-gpu", "-i", freq).start(); } } From c173288dd99edf52fcdcf44264344347a2bde4a7 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Mon, 18 Dec 2023 16:31:52 +0100 Subject: [PATCH 2/2] chore: remove output --- .../sensors/macos/powermetrics/MacOSPowermetricsSensor.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java b/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java index 34bf7e1e..558bcaef 100644 --- a/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java +++ b/server/src/main/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java @@ -248,8 +248,6 @@ public boolean isStarted() { @Override public Map update(Long tick) { - System.out.println("tick = " + tick); - System.out.println("trackedPIDs = " + trackedPIDs); return extractPowerMeasure(powermetrics.getInputStream()); }