Skip to content

Commit 5ca66ca

Browse files
committed
refactor: clean-up
[skip ci]
1 parent 82d2971 commit 5ca66ca

File tree

6 files changed

+5
-10
lines changed

6 files changed

+5
-10
lines changed

backend/src/main/java/net/laprun/sustainability/power/sensors/AbstractPowerSensor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public Set<String> getRegisteredPIDs() {
100100
@Override
101101
public Measures update(Long tick, Map<String, Double> cpuShares) {
102102
final long newUpdateStartEpoch = System.currentTimeMillis();
103-
Log.infof("Sensor update for tick: %d, last called: %dms ago", tick, newUpdateStartEpoch - lastUpdateEpoch);
103+
Log.debugf("Sensor update last called: %dms ago", newUpdateStartEpoch - lastUpdateEpoch);
104104
final var measures = doUpdate(lastUpdateEpoch, newUpdateStartEpoch, cpuShares);
105105
lastUpdateEpoch = newUpdateStartEpoch;
106106
return measures;

backend/src/main/java/net/laprun/sustainability/power/sensors/MapMeasures.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.Set;
44
import java.util.concurrent.ConcurrentHashMap;
55
import java.util.concurrent.ConcurrentMap;
6-
import java.util.function.Consumer;
76

87
import net.laprun.sustainability.power.SensorMeasure;
98

@@ -49,9 +48,4 @@ public void record(RegisteredPID pid, SensorMeasure sensorMeasure) {
4948
public SensorMeasure getOrDefault(RegisteredPID pid) {
5049
return measures.getOrDefault(pid, SensorMeasure.missing);
5150
}
52-
53-
@Override
54-
public void forEach(Consumer<? super SensorMeasure> consumer) {
55-
measures.keySet().forEach(pid -> consumer.accept(getOrDefault(pid)));
56-
}
5751
}

backend/src/main/java/net/laprun/sustainability/power/sensors/Measures.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package net.laprun.sustainability.power.sensors;
22

33
import java.util.Set;
4-
import java.util.function.Consumer;
54

65
import net.laprun.sustainability.power.SensorMeasure;
76

@@ -63,9 +62,8 @@ public interface Measures {
6362
*/
6463
SensorMeasure getOrDefault(RegisteredPID pid);
6564

65+
@SuppressWarnings("unused")
6666
default SensorMeasure getSystemTotal() {
6767
return getOrDefault(RegisteredPID.SYSTEM_TOTAL_REGISTERED_PID);
6868
}
69-
70-
void forEach(Consumer<? super SensorMeasure> consumer);
7169
}

backend/src/main/java/net/laprun/sustainability/power/sensors/linux/rapl/IntelRAPLSensor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ private static SortedMap<String, RAPLFile> defaultRAPLFiles() {
5858
return files;
5959
}
6060

61+
@SuppressWarnings("NonAsciiCharacters")
6162
IntelRAPLSensor(SortedMap<String, RAPLFile> files) {
6263
if (files.isEmpty())
6364
throw new RuntimeException("Failed to get RAPL energy readings, probably due to lack of read access ");

backend/src/main/java/net/laprun/sustainability/power/sensors/macos/powermetrics/NuProcessWrapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public class NuProcessWrapper implements ProcessWrapper {
1010
private PowermetricsProcessHandler measureHandler;
1111
private String periodInMilliSecondsAsString;
1212

13+
@SuppressWarnings("UnusedReturnValue")
1314
private NuProcess exec(PowermetricsProcessHandler handler) {
1415
if (handler == null)
1516
throw new IllegalArgumentException("Handler cannot be null");

backend/src/test/java/net/laprun/sustainability/power/sensors/linux/rapl/IntelRAPLSensorTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ void shouldIncludeCPUShareIfRequested() throws Exception {
132132
assertEquals(cpuShare, components[2]);
133133
}
134134

135+
@SuppressWarnings("SameParameterValue")
135136
private SensorMetadata loadMetadata(String... fileNames) {
136137
Class<? extends IntelRAPLSensorTest> clazz = getClass();
137138
final var files = Arrays.stream(fileNames)

0 commit comments

Comments
 (0)