From 9e5e830e15b74f040708e98c09ea41cd96d13871 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 27 May 2021 16:34:06 +0200
Subject: simulator: Centralize resource logic in SimResourceInterpreter

This change introduces the SimResourceInterpreter which centralizes the
logic for scheduling and interpreting the communication between resource
consumer and provider.

This approach offers better performance due to avoiding invalidating the
state of the resource context when not necessary. Benchmarks show in the
best case a 5x performance improvement and at worst a 2x improvement.
---
 .../kotlin/org/opendc/compute/simulator/SimHost.kt    | 12 +++++++++---
 .../org/opendc/compute/simulator/SimHostTest.kt       | 19 ++++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'opendc-compute/opendc-compute-simulator')

diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt
index 68667a8c..f08a7e1e 100644
--- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt
+++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/SimHost.kt
@@ -41,6 +41,7 @@ import org.opendc.simulator.compute.model.MemoryUnit
 import org.opendc.simulator.compute.power.ConstantPowerModel
 import org.opendc.simulator.compute.power.PowerModel
 import org.opendc.simulator.failures.FailureDomain
+import org.opendc.simulator.resources.SimResourceInterpreter
 import java.time.Clock
 import java.util.*
 import kotlin.coroutines.CoroutineContext
@@ -94,18 +95,23 @@ public class SimHost(
     /**
      * Current total memory use of the images on this hypervisor.
      */
-    private var availableMemory: Long = model.memory.map { it.size }.sum()
+    private var availableMemory: Long = model.memory.sumOf { it.size }
+
+    /**
+     * The resource interpreter to schedule the resource interactions.
+     */
+    private val interpreter = SimResourceInterpreter(context, clock)
 
     /**
      * The machine to run on.
      */
-    public val machine: SimBareMetalMachine = SimBareMetalMachine(context, clock, model, scalingGovernor, scalingDriver)
+    public val machine: SimBareMetalMachine = SimBareMetalMachine(interpreter, model, scalingGovernor, scalingDriver)
 
     /**
      * The hypervisor to run multiple workloads.
      */
     public val hypervisor: SimHypervisor = hypervisor.create(
-        scope.coroutineContext, clock,
+        interpreter,
         object : SimHypervisor.Listener {
             override fun onSliceFinish(
                 hypervisor: SimHypervisor,
diff --git a/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimHostTest.kt b/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimHostTest.kt
index 5594fd59..a6cff3ba 100644
--- a/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimHostTest.kt
+++ b/opendc-compute/opendc-compute-simulator/src/test/kotlin/org/opendc/compute/simulator/SimHostTest.kt
@@ -124,9 +124,18 @@ internal class SimHostTest {
             object : MetricExporter {
                 override fun export(metrics: Collection<MetricData>): CompletableResultCode {
                     val metricsByName = metrics.associateBy { it.name }
-                    requestedWork += metricsByName.getValue("cpu.work.total").doubleSummaryData.points.first().sum.toLong()
-                    grantedWork += metricsByName.getValue("cpu.work.granted").doubleSummaryData.points.first().sum.toLong()
-                    overcommittedWork += metricsByName.getValue("cpu.work.overcommit").doubleSummaryData.points.first().sum.toLong()
+                    val totalWork = metricsByName["cpu.work.total"]
+                    if (totalWork != null) {
+                        requestedWork += totalWork.doubleSummaryData.points.first().sum.toLong()
+                    }
+                    val grantedWorkCycle = metricsByName["cpu.work.granted"]
+                    if (grantedWorkCycle != null) {
+                        grantedWork += grantedWorkCycle.doubleSummaryData.points.first().sum.toLong()
+                    }
+                    val overcommittedWorkCycle = metricsByName["cpu.work.overcommit"]
+                    if (overcommittedWorkCycle != null) {
+                        overcommittedWork += overcommittedWorkCycle.doubleSummaryData.points.first().sum.toLong()
+                    }
                     return CompletableResultCode.ofSuccess()
                 }
 
@@ -160,8 +169,8 @@ internal class SimHostTest {
         reader.close()
 
         assertAll(
-            { assertEquals(4197600, requestedWork, "Requested work does not match") },
-            { assertEquals(2157600, grantedWork, "Granted work does not match") },
+            { assertEquals(4147200, requestedWork, "Requested work does not match") },
+            { assertEquals(2107200, grantedWork, "Granted work does not match") },
             { assertEquals(2040000, overcommittedWork, "Overcommitted work does not match") },
             { assertEquals(1500001, clock.millis()) }
         )
-- 
cgit v1.2.3