diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2021-06-21 20:57:06 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2021-06-21 20:57:06 +0200 |
| commit | b29f90e5ad5bcac29cde86e56c06e0b65a52cedc (patch) | |
| tree | 4483016fd06b44edb57ed5d96344c2933452fdb8 /opendc-experiments/opendc-experiments-energy21 | |
| parent | f28cc9964ad1ca1c074331ed54053d469e7373e5 (diff) | |
simulator: Re-organize compute simulator module
This change re-organizes the classes of the compute simulator module to
make a clearer distinction between the hardware, firmware and software
interfaces in this module.
Diffstat (limited to 'opendc-experiments/opendc-experiments-energy21')
| -rw-r--r-- | opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt b/opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt index 2f14776a..28928dcb 100644 --- a/opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt +++ b/opendc-experiments/opendc-experiments-energy21/src/main/kotlin/org/opendc/experiments/energy21/EnergyExperiment.kt @@ -41,9 +41,9 @@ import org.opendc.experiments.capelin.monitor.ParquetExperimentMonitor import org.opendc.experiments.capelin.trace.Sc20StreamingParquetTraceReader import org.opendc.harness.dsl.Experiment import org.opendc.harness.dsl.anyOf -import org.opendc.simulator.compute.SimFairShareHypervisorProvider -import org.opendc.simulator.compute.SimMachineModel -import org.opendc.simulator.compute.cpufreq.* +import org.opendc.simulator.compute.kernel.SimFairShareHypervisorProvider +import org.opendc.simulator.compute.kernel.cpufreq.PerformanceScalingGovernor +import org.opendc.simulator.compute.model.MachineModel import org.opendc.simulator.compute.model.MemoryUnit import org.opendc.simulator.compute.model.ProcessingNode import org.opendc.simulator.compute.model.ProcessingUnit @@ -156,12 +156,12 @@ public class EnergyExperiment : Experiment("Energy Modeling 2021") { /** * The machine model based on: https://www.spec.org/power_ssj2008/results/res2020q1/power_ssj2008-20191125-01012.html */ - private fun createMachineModel(): SimMachineModel { + private fun createMachineModel(): MachineModel { val node = ProcessingNode("AMD", "am64", "EPYC 7742", 64) val cpus = List(node.coreCount) { id -> ProcessingUnit(node, id, 3400.0) } val memory = List(8) { MemoryUnit("Samsung", "Unknown", 2933.0, 16_000) } - return SimMachineModel(cpus, memory) + return MachineModel(cpus, memory) } /** |