From 4a010c6b9e033314a2624a0756dcdc7f17010d9d Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Mon, 16 Sep 2024 11:29:26 +0200 Subject: All simulation are now run with a single CPU and single MemoryUnit. multi CPUs are combined into one. This is for performance and explainability. (#255) --- .../test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'opendc-experiments/opendc-experiments-faas/src/test') diff --git a/opendc-experiments/opendc-experiments-faas/src/test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt b/opendc-experiments/opendc-experiments-faas/src/test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt index 346059a8..49d7d489 100644 --- a/opendc-experiments/opendc-experiments-faas/src/test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt +++ b/opendc-experiments/opendc-experiments-faas/src/test/kotlin/org/opendc/experiments/faas/FaaSExperiment.kt @@ -30,10 +30,9 @@ import org.opendc.faas.service.FaaSService import org.opendc.faas.service.autoscaler.FunctionTerminationPolicyFixed import org.opendc.faas.service.router.RandomRoutingPolicy import org.opendc.faas.simulator.delay.ColdStartModel +import org.opendc.simulator.compute.model.Cpu 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 import org.opendc.simulator.kotlin.runSimulation import java.io.File import java.time.Duration @@ -80,13 +79,11 @@ class FaaSExperiment { * Construct the machine model to test with. */ private fun createMachineModel(): MachineModel { - val cpuNode = ProcessingNode("Intel", "Xeon", "amd64", 2) - return MachineModel( // cpus - List(cpuNode.coreCount) { ProcessingUnit(cpuNode, it, 1000.0) }, + Cpu(0, 2, 1000.0, "Intel", "Xeon", "amd64"), // memory - List(4) { MemoryUnit("Crucial", "MTA18ASF4G72AZ-3G2B1", 3200.0, 32_000) }, + MemoryUnit("Crucial", "MTA18ASF4G72AZ-3G2B1", 3200.0, 32_000 * 4), ) } } -- cgit v1.2.3