simulator: Add generic framework for resource consumption modeling

This change adds a generic framework for modeling resource consumptions and
adapts opendc-simulator-compute to model machines and VMs on top of
this framework.

This framework anticipates the addition of additional resource types
such as memory, disk and network to the OpenDC codebase.

3 files changed, 22 insertions, 22 deletions

diff --git a/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc18/Sc18EnvironmentReader.kt b/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc18/Sc18EnvironmentReader.kt
index 3da8d0b3..85a2e413 100644
--- a/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc18/Sc18EnvironmentReader.kt
+++ b/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc18/Sc18EnvironmentReader.kt
@@ -29,9 +29,9 @@ import org.opendc.compute.simulator.power.models.ConstantPowerModel
 import org.opendc.format.environment.EnvironmentReader
 import org.opendc.format.environment.MachineDef
 import org.opendc.simulator.compute.SimMachineModel
-import org.opendc.simulator.compute.model.MemoryUnit
-import org.opendc.simulator.compute.model.ProcessingNode
-import org.opendc.simulator.compute.model.ProcessingUnit
+import org.opendc.simulator.compute.model.SimMemoryUnit
+import org.opendc.simulator.compute.model.SimProcessingNode
+import org.opendc.simulator.compute.model.SimProcessingUnit
 import java.io.InputStream
 import java.util.*
 
@@ -61,12 +61,12 @@ public class Sc18EnvironmentReader(input: InputStream, mapper: ObjectMapper = ja
                             val cores = machine.cpus.flatMap { id ->
                                 when (id) {
                                     1 -> {
-                                        val node = ProcessingNode("Intel", "Core(TM) i7-6920HQ", "amd64", 4)
-                                        List(node.coreCount) { ProcessingUnit(node, it, 4100.0) }
+                                        val node = SimProcessingNode("Intel", "Core(TM) i7-6920HQ", "amd64", 4)
+                                        List(node.coreCount) { SimProcessingUnit(node, it, 4100.0) }
                                     }
                                     2 -> {
-                                        val node = ProcessingNode("Intel", "Core(TM) i7-6920HQ", "amd64", 2)
-                                        List(node.coreCount) { ProcessingUnit(node, it, 3500.0) }
+                                        val node = SimProcessingNode("Intel", "Core(TM) i7-6920HQ", "amd64", 2)
+                                        List(node.coreCount) { SimProcessingUnit(node, it, 3500.0) }
                                     }
                                     else -> throw IllegalArgumentException("The cpu id $id is not recognized")
                                 }
@@ -75,7 +75,7 @@ public class Sc18EnvironmentReader(input: InputStream, mapper: ObjectMapper = ja
                                 UUID(0L, counter++.toLong()),
                                 "node-$counter",
                                 emptyMap(),
-                                SimMachineModel(cores, listOf(MemoryUnit("", "", 2300.0, 16000))),
+                                SimMachineModel(cores, listOf(SimMemoryUnit("", "", 2300.0, 16000))),
                                 ConstantPowerModel(0.0)
                             )
                         }
diff --git a/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt b/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt
index 9a06a40f..094bc975 100644
--- a/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt
+++ b/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20ClusterEnvironmentReader.kt
@@ -26,9 +26,9 @@ import org.opendc.compute.simulator.power.models.LinearPowerModel
 import org.opendc.format.environment.EnvironmentReader
 import org.opendc.format.environment.MachineDef
 import org.opendc.simulator.compute.SimMachineModel
-import org.opendc.simulator.compute.model.MemoryUnit
-import org.opendc.simulator.compute.model.ProcessingNode
-import org.opendc.simulator.compute.model.ProcessingUnit
+import org.opendc.simulator.compute.model.SimMemoryUnit
+import org.opendc.simulator.compute.model.SimProcessingNode
+import org.opendc.simulator.compute.model.SimProcessingUnit
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream
@@ -88,8 +88,8 @@ public class Sc20ClusterEnvironmentReader(
                     memoryPerHost = values[memoryPerHostCol].trim().toLong() * 1000L
                     coresPerHost = values[coresPerHostCol].trim().toInt()
 
-                    val unknownProcessingNode = ProcessingNode("unknown", "unknown", "unknown", coresPerHost)
-                    val unknownMemoryUnit = MemoryUnit("unknown", "unknown", -1.0, memoryPerHost)
+                    val unknownProcessingNode = SimProcessingNode("unknown", "unknown", "unknown", coresPerHost)
+                    val unknownMemoryUnit = SimMemoryUnit("unknown", "unknown", -1.0, memoryPerHost)
 
                     repeat(numberOfHosts) {
                         nodes.add(
@@ -99,7 +99,7 @@ public class Sc20ClusterEnvironmentReader(
                                 mapOf("cluster" to clusterId),
                                 SimMachineModel(
                                     List(coresPerHost) { coreId ->
-                                        ProcessingUnit(unknownProcessingNode, coreId, speed)
+                                        SimProcessingUnit(unknownProcessingNode, coreId, speed)
                                     },
                                     listOf(unknownMemoryUnit)
                                 ),
diff --git a/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20EnvironmentReader.kt b/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20EnvironmentReader.kt
index effd0286..87a49f49 100644
--- a/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20EnvironmentReader.kt
+++ b/simulator/opendc-format/src/main/kotlin/org/opendc/format/environment/sc20/Sc20EnvironmentReader.kt
@@ -29,9 +29,9 @@ import org.opendc.compute.simulator.power.models.LinearPowerModel
 import org.opendc.format.environment.EnvironmentReader
 import org.opendc.format.environment.MachineDef
 import org.opendc.simulator.compute.SimMachineModel
-import org.opendc.simulator.compute.model.MemoryUnit
-import org.opendc.simulator.compute.model.ProcessingNode
-import org.opendc.simulator.compute.model.ProcessingUnit
+import org.opendc.simulator.compute.model.SimMemoryUnit
+import org.opendc.simulator.compute.model.SimProcessingNode
+import org.opendc.simulator.compute.model.SimProcessingUnit
 import java.io.InputStream
 import java.util.*
 
@@ -60,19 +60,19 @@ public class Sc20EnvironmentReader(input: InputStream, mapper: ObjectMapper = ja
                             val cores = machine.cpus.flatMap { id ->
                                 when (id) {
                                     1 -> {
-                                        val node = ProcessingNode("Intel", "Core(TM) i7-6920HQ", "amd64", 4)
-                                        List(node.coreCount) { ProcessingUnit(node, it, 4100.0) }
+                                        val node = SimProcessingNode("Intel", "Core(TM) i7-6920HQ", "amd64", 4)
+                                        List(node.coreCount) { SimProcessingUnit(node, it, 4100.0) }
                                     }
                                     2 -> {
-                                        val node = ProcessingNode("Intel", "Core(TM) i7-6920HQ", "amd64", 2)
-                                        List(node.coreCount) { ProcessingUnit(node, it, 3500.0) }
+                                        val node = SimProcessingNode("Intel", "Core(TM) i7-6920HQ", "amd64", 2)
+                                        List(node.coreCount) { SimProcessingUnit(node, it, 3500.0) }
                                     }
                                     else -> throw IllegalArgumentException("The cpu id $id is not recognized")
                                 }
                             }
                             val memories = machine.memories.map { id ->
                                 when (id) {
-                                    1 -> MemoryUnit("Samsung", "PC DRAM K4A4G045WD", 1600.0, 4_000L)
+                                    1 -> SimMemoryUnit("Samsung", "PC DRAM K4A4G045WD", 1600.0, 4_000L)
                                     else -> throw IllegalArgumentException("The cpu id $id is not recognized")
                                 }
                             }