Skip to content

fix: correctly report GPU #8

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 2 commits into from
Dec 18, 2023
Merged

fix: correctly report GPU #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12aedf5
fix: correctly report GPU
metacosm Dec 18, 2023
3b5e7b7
fix: do not set measure for each component
metacosm Dec 18, 2023
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
11 changes: 8 additions & 3 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 @@ -199,14 +199,19 @@ Map<RegisteredPID, double[]> extractPowerMeasure(InputStream powerMeasureInput)
final var value = CPU_SHARE.equals(name) ? cpuShare : powerComponents.getOrDefault(name, 0);

if (cm.isAttributed()) {
final var attributionFactor = hasGPU && GPU.equals(name) ? record.gpu / finalTotalSampledGPU : cpuShare;
final double attributionFactor;
if (GPU.equals(name)) {
attributionFactor = hasGPU ? record.gpu / finalTotalSampledGPU : 0.0;
} else {
attributionFactor = cpuShare;
}
measure[index] = value * attributionFactor;
} else {
measure[index] = value;
}

results.put(pid, measure);
});

results.put(pid, measure);
});
return results;
} catch (Exception exception) {
Expand Down
4 changes: 4 additions & 0 deletions ...java/io/github/metacosm/power/sensors/macos/powermetrics/MacOSPowermetricsSensorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,9 @@ void extractPowerMeasure() {
final var cpuShareIndex = metadata.metadataFor(MacOSPowermetricsSensor.CPU_SHARE).index();
assertEquals(pid1CPUShare, measure.get(pid1)[cpuShareIndex]);
assertEquals(pid2CPUShare, measure.get(pid2)[cpuShareIndex]);
// check that gpu should be 0
final var gpuIndex = metadata.metadataFor(MacOSPowermetricsSensor.GPU).index();
assertEquals(0.0, measure.get(pid1)[gpuIndex]);
assertEquals(0.0, measure.get(pid2)[gpuIndex]);
}
}