refactor(simulator): Merge distributor and aggregator into switch

This change removes the distributor and aggregator interfaces in favour
of a single switch interface. Since the switch interface is as powerful
as both the distributor and aggregator, we don't need the latter two.

2 files changed, 13 insertions, 3 deletions

diff --git a/opendc-simulator/opendc-simulator-compute/src/main/kotlin/org/opendc/simulator/compute/kernel/SimAbstractHypervisor.kt b/opendc-simulator/opendc-simulator-compute/src/main/kotlin/org/opendc/simulator/compute/kernel/SimAbstractHypervisor.kt
index 98271fb0..cf9e3230 100644
--- a/opendc-simulator/opendc-simulator-compute/src/main/kotlin/org/opendc/simulator/compute/kernel/SimAbstractHypervisor.kt
+++ b/opendc-simulator/opendc-simulator-compute/src/main/kotlin/org/opendc/simulator/compute/kernel/SimAbstractHypervisor.kt
@@ -131,7 +131,7 @@ public abstract class SimAbstractHypervisor(
         /**
          * The vCPUs of the machine.
          */
-        override val cpus = model.cpus.map { VCpu(switch.newOutput(interferenceKey), it) }
+        override val cpus = model.cpus.map { VCpu(switch, switch.newOutput(interferenceKey), it) }
 
         override fun close() {
             super.close()
@@ -153,9 +153,10 @@ public abstract class SimAbstractHypervisor(
      * A [SimProcessingUnit] of a virtual machine.
      */
     private class VCpu(
-        private val source: SimResourceCloseableProvider,
+        private val switch: SimResourceSwitch,
+        private val source: SimResourceProvider,
         override val model: ProcessingUnit
-    ) : SimProcessingUnit, SimResourceCloseableProvider by source {
+    ) : SimProcessingUnit, SimResourceProvider by source {
         override var capacity: Double
             get() = source.capacity
             set(_) {
@@ -163,6 +164,13 @@ public abstract class SimAbstractHypervisor(
             }
 
         override fun toString(): String = "SimAbstractHypervisor.VCpu[model=$model]"
+
+        /**
+         * Close the CPU
+         */
+        fun close() {
+            switch.removeOutput(source)
+        }
     }
 
     /**
diff --git a/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/kernel/SimHypervisorTest.kt b/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/kernel/SimHypervisorTest.kt
index 1f010338..8cd535ad 100644
--- a/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/kernel/SimHypervisorTest.kt
+++ b/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/kernel/SimHypervisorTest.kt
@@ -103,8 +103,10 @@ internal class SimHypervisorTest {
             println("Hypervisor finished")
         }
         yield()
+
         val vm = hypervisor.createMachine(model)
         vm.run(workloadA)
+
         yield()
         machine.close()