refactor(sim/compute): Extract Random dependency from interference model

This change moves the Random dependency outside the interference model,
to allow the interference model to be completely immutable and passable
between different simulations.

1 files changed, 7 insertions, 3 deletions

diff --git a/opendc-simulator/opendc-simulator-compute/src/jmh/kotlin/org/opendc/simulator/compute/SimMachineBenchmarks.kt b/opendc-simulator/opendc-simulator-compute/src/jmh/kotlin/org/opendc/simulator/compute/SimMachineBenchmarks.kt
index 02b48fa7..c3332d66 100644
--- a/opendc-simulator/opendc-simulator-compute/src/jmh/kotlin/org/opendc/simulator/compute/SimMachineBenchmarks.kt
+++ b/opendc-simulator/opendc-simulator-compute/src/jmh/kotlin/org/opendc/simulator/compute/SimMachineBenchmarks.kt
@@ -37,6 +37,7 @@ import org.opendc.simulator.compute.workload.SimTraceWorkload
 import org.opendc.simulator.core.runBlockingSimulation
 import org.opendc.simulator.flow.FlowEngine
 import org.openjdk.jmh.annotations.*
+import java.util.SplittableRandom
 import java.util.concurrent.ThreadLocalRandom
 import java.util.concurrent.TimeUnit
 
@@ -85,7 +86,8 @@ class SimMachineBenchmarks {
             val machine = SimBareMetalMachine(
                 engine, machineModel, SimplePowerDriver(ConstantPowerModel(0.0))
             )
-            val hypervisor = SimSpaceSharedHypervisor(engine, null)
+            val random = SplittableRandom(1)
+            val hypervisor = SimSpaceSharedHypervisor(engine, null, random)
 
             launch { machine.runWorkload(hypervisor) }
 
@@ -107,7 +109,8 @@ class SimMachineBenchmarks {
             val machine = SimBareMetalMachine(
                 engine, machineModel, SimplePowerDriver(ConstantPowerModel(0.0))
             )
-            val hypervisor = SimFairShareHypervisor(engine, null)
+            val random = SplittableRandom(1)
+            val hypervisor = SimFairShareHypervisor(engine, null, random)
 
             launch { machine.runWorkload(hypervisor) }
 
@@ -129,7 +132,8 @@ class SimMachineBenchmarks {
             val machine = SimBareMetalMachine(
                 engine, machineModel, SimplePowerDriver(ConstantPowerModel(0.0))
             )
-            val hypervisor = SimFairShareHypervisor(engine, null)
+            val random = SplittableRandom(1)
+            val hypervisor = SimFairShareHypervisor(engine, null, random)
 
             launch { machine.runWorkload(hypervisor) }