Skip to content

refactor: optimize line splitting and comment checking #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 29, 2023
Merged

refactor: optimize line splitting and comment checking #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...ain/java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.util.HashSet;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;

public class MacOSPowermetricsSensor implements PowerSensor {
public static final String CPU = "CPU";
Expand Down Expand Up @@ -110,11 +111,12 @@ private static class ProcessRecord {
final double cpu;
final double gpu;
final String pid;
private static final Pattern spaces = Pattern.compile("\\s+");

public ProcessRecord(String line) throws IllegalArgumentException {
//Name ID CPU ms/s samp ms/s User% Deadlines (<2 ms, 2-5 ms) Wakeups (Intr, Pkg idle) GPU ms/s
//iTerm2 1008 46.66 46.91 83.94 0.00 0.00 30.46 0.00 0.00
final var processData = line.split("\\s+");
final var processData = spaces.split(line, 10);
if (processData.length != 10) {
throw new IllegalArgumentException("Received line doesn't conform to expected format: " + line);
}
Expand Down Expand Up @@ -149,7 +151,7 @@ Measures extractPowerMeasure(InputStream powerMeasureInput, Long tick) {
continue;
}

if (line.isEmpty() || line.startsWith("*")) {
if (line.isEmpty() || line.charAt(0) == '*') {
continue;
}

Expand Down