diff options
Diffstat (limited to 'opendc-simulator')
3 files changed, 10 insertions, 5 deletions
diff --git a/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/cpu/SimCpu.java b/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/cpu/SimCpu.java index 18214172..d3edc957 100644 --- a/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/cpu/SimCpu.java +++ b/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/cpu/SimCpu.java @@ -101,13 +101,13 @@ public final class SimCpu extends FlowNode implements FlowSupplier, FlowConsumer // Constructors //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - public SimCpu(FlowGraph graph, CpuModel cpuModel, int id) { + public SimCpu(FlowGraph graph, CpuModel cpuModel, CpuPowerModel powerModel, int id) { super(graph); this.cpuModel = cpuModel; this.maxCapacity = this.cpuModel.getTotalCapacity(); // TODO: connect this to the front-end - this.cpuPowerModel = CpuPowerModels.linear(400, 200); + this.cpuPowerModel = powerModel; this.lastCounterUpdate = graph.getEngine().getClock().millis(); diff --git a/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/machine/SimMachine.java b/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/machine/SimMachine.java index c7caa63f..8364324a 100644 --- a/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/machine/SimMachine.java +++ b/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/machine/SimMachine.java @@ -25,6 +25,7 @@ package org.opendc.simulator.compute.machine; import java.time.InstantSource; import java.util.function.Consumer; import org.opendc.simulator.Multiplexer; +import org.opendc.simulator.compute.cpu.CpuPowerModel; import org.opendc.simulator.compute.cpu.SimCpu; import org.opendc.simulator.compute.memory.Memory; import org.opendc.simulator.compute.models.MachineModel; @@ -111,7 +112,11 @@ public class SimMachine { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// public SimMachine( - FlowGraph graph, MachineModel machineModel, Multiplexer powerMux, Consumer<Exception> completion) { + FlowGraph graph, + MachineModel machineModel, + Multiplexer powerMux, + CpuPowerModel cpuPowerModel, + Consumer<Exception> completion) { this.graph = graph; this.machineModel = machineModel; this.clock = graph.getEngine().getClock(); @@ -121,7 +126,7 @@ public class SimMachine { graph.addEdge(this.psu, powerMux); - this.cpu = new SimCpu(graph, this.machineModel.getCpu(), 0); + this.cpu = new SimCpu(graph, this.machineModel.getCpuModel(), cpuPowerModel, 0); graph.addEdge(this.cpu, this.psu); diff --git a/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/models/MachineModel.java b/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/models/MachineModel.java index d6d139d7..6c47fbe6 100644 --- a/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/models/MachineModel.java +++ b/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/models/MachineModel.java @@ -67,7 +67,7 @@ public final class MachineModel { /** * Return the processing units of this machine. */ - public CpuModel getCpu() { + public CpuModel getCpuModel() { return this.cpuModel; } |