Skip to content

Commit

Permalink
chore: move from io.github.metacosm to net.laprun.sustainability (#20)
Browse files Browse the repository at this point in the history
* chore: move from io.github.metacosm to net.laprun.sustainability

* refactor: clean-up
  • Loading branch information
metacosm committed Feb 4, 2024
1 parent c03d76b commit e51832d
Show file tree
Hide file tree
Showing 31 changed files with 75 additions and 74 deletions.
2 changes: 1 addition & 1 deletion build-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.github.metacosm</groupId>
<groupId>net.laprun.sustainability</groupId>
<artifactId>power-server-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Expand Down
4 changes: 2 additions & 2 deletions metadata/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.github.metacosm</groupId>
<groupId>net.laprun.sustainability</groupId>
<artifactId>power-server-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Expand All @@ -20,7 +20,7 @@
<artifactId>formatter-maven-plugin</artifactId>
<dependencies>
<dependency>
<groupId>io.github.metacosm</groupId>
<groupId>net.laprun.sustainability</groupId>
<artifactId>build-tools</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power;
package net.laprun.sustainability.power;

public record SensorMeasure(double[] components, long tick) {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power;
package net.laprun.sustainability.power;

import java.util.Collections;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.metacosm</groupId>
<groupId>net.laprun.sustainability</groupId>
<artifactId>power-server-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
Expand Down
6 changes: 3 additions & 3 deletions server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.github.metacosm</groupId>
<groupId>net.laprun.sustainability</groupId>
<artifactId>power-server-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Expand All @@ -17,7 +17,7 @@
</properties>
<dependencies>
<dependency>
<groupId>io.github.metacosm</groupId>
<groupId>net.laprun.sustainability</groupId>
<artifactId>power-server-metadata</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
Expand All @@ -30,7 +30,7 @@
<artifactId>formatter-maven-plugin</artifactId>
<dependencies>
<dependency>
<groupId>io.github.metacosm</groupId>
<groupId>net.laprun.sustainability</groupId>
<artifactId>build-tools</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package io.github.metacosm.power;
package net.laprun.sustainability.power;

import java.time.Duration;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

import io.github.metacosm.power.sensors.Measures;
import io.github.metacosm.power.sensors.PowerSensor;
import io.smallrye.mutiny.Multi;
import io.smallrye.mutiny.infrastructure.Infrastructure;
import net.laprun.sustainability.power.sensors.Measures;
import net.laprun.sustainability.power.sensors.PowerSensor;

@ApplicationScoped
public class PowerMeasurer {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power;
package net.laprun.sustainability.power;

import jakarta.inject.Inject;
import jakarta.ws.rs.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.github.metacosm.power.sensors;
package net.laprun.sustainability.power.sensors;

import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;

import io.github.metacosm.power.SensorMeasure;
import net.laprun.sustainability.power.SensorMeasure;

public class MapMeasures implements Measures {
private final ConcurrentMap<RegisteredPID, SensorMeasure> measures = new ConcurrentHashMap<>();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.github.metacosm.power.sensors;
package net.laprun.sustainability.power.sensors;

import java.util.Set;

import io.github.metacosm.power.SensorMeasure;
import net.laprun.sustainability.power.SensorMeasure;

public interface Measures {
SensorMeasure missing = new SensorMeasure(new double[] { -1.0 }, -1);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.github.metacosm.power.sensors;
package net.laprun.sustainability.power.sensors;

import io.github.metacosm.power.SensorMetadata;
import net.laprun.sustainability.power.SensorMetadata;

public interface PowerSensor {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.github.metacosm.power.sensors;
package net.laprun.sustainability.power.sensors;

import jakarta.enterprise.inject.Produces;
import jakarta.inject.Singleton;

import io.github.metacosm.power.sensors.linux.rapl.IntelRAPLSensor;
import io.github.metacosm.power.sensors.macos.powermetrics.ProcessMacOSPowermetricsSensor;
import net.laprun.sustainability.power.sensors.linux.rapl.IntelRAPLSensor;
import net.laprun.sustainability.power.sensors.macos.powermetrics.ProcessMacOSPowermetricsSensor;

@Singleton
public class PowerSensorProducer {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power.sensors;
package net.laprun.sustainability.power.sensors;

public record RegisteredPID(String stringForMatching) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power.sensors.linux.rapl;
package net.laprun.sustainability.power.sensors.linux.rapl;

import java.io.FileNotFoundException;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package io.github.metacosm.power.sensors.linux.rapl;
package net.laprun.sustainability.power.sensors.linux.rapl;

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;

import io.github.metacosm.power.SensorMeasure;
import io.github.metacosm.power.SensorMetadata;
import io.github.metacosm.power.sensors.Measures;
import io.github.metacosm.power.sensors.PowerSensor;
import io.github.metacosm.power.sensors.RegisteredPID;
import net.laprun.sustainability.power.SensorMeasure;
import net.laprun.sustainability.power.SensorMetadata;
import net.laprun.sustainability.power.sensors.Measures;
import net.laprun.sustainability.power.sensors.PowerSensor;
import net.laprun.sustainability.power.sensors.RegisteredPID;

public class IntelRAPLSensor implements PowerSensor {
private final RAPLFile[] raplFiles;
Expand Down Expand Up @@ -67,7 +67,7 @@ private static boolean isReadable(Path file) {
}

@Override
public void start(long frequency) throws Exception {
public void start(long frequency) {
this.frequency = frequency;

// perform an initial measure to prime the data
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power.sensors.linux.rapl;
package net.laprun.sustainability.power.sensors.linux.rapl;

import java.nio.file.Path;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.github.metacosm.power.sensors.linux.rapl;
package net.laprun.sustainability.power.sensors.linux.rapl;

import java.util.HashSet;
import java.util.Set;

import io.github.metacosm.power.SensorMeasure;
import io.github.metacosm.power.sensors.Measures;
import io.github.metacosm.power.sensors.RegisteredPID;
import net.laprun.sustainability.power.SensorMeasure;
import net.laprun.sustainability.power.sensors.Measures;
import net.laprun.sustainability.power.sensors.RegisteredPID;

class SingleMeasureMeasures implements Measures {
private final Set<RegisteredPID> trackedPIDs = new HashSet<>();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package io.github.metacosm.power.sensors.macos.powermetrics;
package net.laprun.sustainability.power.sensors.macos.powermetrics;

import static io.github.metacosm.power.sensors.macos.powermetrics.MacOSPowermetricsSensor.*;
import static net.laprun.sustainability.power.sensors.macos.powermetrics.MacOSPowermetricsSensor.*;

import java.util.HashMap;
import java.util.Map;

import io.github.metacosm.power.SensorMetadata;
import net.laprun.sustainability.power.SensorMetadata;

class AppleSiliconCPU extends io.github.metacosm.power.sensors.macos.powermetrics.CPU {
class AppleSiliconCPU extends CPU {
private static final SensorMetadata.ComponentMetadata cpuComponent = new SensorMetadata.ComponentMetadata(CPU, 0,
"CPU power", true, "mW");
private static final SensorMetadata.ComponentMetadata gpuComponent = new SensorMetadata.ComponentMetadata(GPU, 1,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.github.metacosm.power.sensors.macos.powermetrics;
package net.laprun.sustainability.power.sensors.macos.powermetrics;

import java.util.HashMap;
import java.util.Map;

import io.github.metacosm.power.SensorMetadata;
import net.laprun.sustainability.power.SensorMetadata;

abstract class CPU {
private SensorMetadata metadata;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.github.metacosm.power.sensors.macos.powermetrics;
package net.laprun.sustainability.power.sensors.macos.powermetrics;

import static io.github.metacosm.power.sensors.macos.powermetrics.MacOSPowermetricsSensor.CPU_SHARE;
import static io.github.metacosm.power.sensors.macos.powermetrics.MacOSPowermetricsSensor.PACKAGE;
import static net.laprun.sustainability.power.sensors.macos.powermetrics.MacOSPowermetricsSensor.CPU_SHARE;
import static net.laprun.sustainability.power.sensors.macos.powermetrics.MacOSPowermetricsSensor.PACKAGE;

import java.util.HashMap;
import java.util.Map;

import io.github.metacosm.power.SensorMetadata;
import net.laprun.sustainability.power.SensorMetadata;

class IntelCPU extends CPU {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power.sensors.macos.powermetrics;
package net.laprun.sustainability.power.sensors.macos.powermetrics;

import java.io.BufferedReader;
import java.io.IOException;
Expand All @@ -9,12 +9,12 @@
import java.util.Map;
import java.util.regex.Pattern;

import io.github.metacosm.power.SensorMeasure;
import io.github.metacosm.power.SensorMetadata;
import io.github.metacosm.power.sensors.MapMeasures;
import io.github.metacosm.power.sensors.Measures;
import io.github.metacosm.power.sensors.PowerSensor;
import io.github.metacosm.power.sensors.RegisteredPID;
import net.laprun.sustainability.power.SensorMeasure;
import net.laprun.sustainability.power.SensorMetadata;
import net.laprun.sustainability.power.sensors.MapMeasures;
import net.laprun.sustainability.power.sensors.Measures;
import net.laprun.sustainability.power.sensors.PowerSensor;
import net.laprun.sustainability.power.sensors.RegisteredPID;

public abstract class MacOSPowermetricsSensor implements PowerSensor {
public static final String CPU = "CPU";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power.sensors.macos.powermetrics;
package net.laprun.sustainability.power.sensors.macos.powermetrics;

import java.io.InputStream;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power.sensors.macos.powermetrics;
package net.laprun.sustainability.power.sensors.macos.powermetrics;

import java.io.InputStream;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package io.github.metacosm.power.sensors.test;
package net.laprun.sustainability.power.sensors.test;

import java.util.Map;

import io.github.metacosm.power.SensorMeasure;
import io.github.metacosm.power.SensorMetadata;
import io.github.metacosm.power.sensors.MapMeasures;
import io.github.metacosm.power.sensors.Measures;
import io.github.metacosm.power.sensors.PowerSensor;
import io.github.metacosm.power.sensors.RegisteredPID;
import net.laprun.sustainability.power.SensorMeasure;
import net.laprun.sustainability.power.SensorMetadata;
import net.laprun.sustainability.power.sensors.MapMeasures;
import net.laprun.sustainability.power.sensors.Measures;
import net.laprun.sustainability.power.sensors.PowerSensor;
import net.laprun.sustainability.power.sensors.RegisteredPID;

@SuppressWarnings("unused")
public class TestPowerSensor implements PowerSensor {
public static final String CPU = "cpu";
public static final SensorMetadata DEFAULT = new SensorMetadata(
Expand Down Expand Up @@ -37,7 +38,7 @@ public boolean isStarted() {
}

@Override
public void start(long samplingFrequencyInMillis) throws Exception {
public void start(long samplingFrequencyInMillis) {
if (!started) {
started = true;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power;
package net.laprun.sustainability.power;

import static io.restassured.RestAssured.given;
import static org.junit.jupiter.api.Assertions.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power;
package net.laprun.sustainability.power;

import java.util.Set;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power;
package net.laprun.sustainability.power;

import io.quarkus.test.Mock;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.github.metacosm.power;
package net.laprun.sustainability.power;

import io.github.metacosm.power.sensors.macos.powermetrics.ResourceMacOSPowermetricsSensor;
import io.quarkus.test.Mock;
import net.laprun.sustainability.power.sensors.macos.powermetrics.ResourceMacOSPowermetricsSensor;

@Mock
@SuppressWarnings("unused")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power;
package net.laprun.sustainability.power;

import io.quarkus.test.junit.QuarkusIntegrationTest;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.github.metacosm.power;
package net.laprun.sustainability.power;

import static io.restassured.RestAssured.given;
import static org.junit.jupiter.api.Assertions.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.github.metacosm.power.sensors.macos.powermetrics;
package net.laprun.sustainability.power.sensors.macos.powermetrics;

import static org.junit.jupiter.api.Assertions.assertEquals;

import org.junit.jupiter.api.Test;

import io.github.metacosm.power.SensorMetadata;
import io.github.metacosm.power.sensors.Measures;
import io.github.metacosm.power.sensors.RegisteredPID;
import net.laprun.sustainability.power.SensorMetadata;
import net.laprun.sustainability.power.sensors.Measures;
import net.laprun.sustainability.power.sensors.RegisteredPID;

class MacOSPowermetricsSensorTest {

Expand Down

0 comments on commit e51832d

Please sign in to comment.