perf(simulator): Optimize SimTraceWorkload

This change improves the performance of the SimTraceWorkload class by
changing the way trace fragments are read and processed by the CPU
consumers.

3 files changed, 53 insertions, 53 deletions

diff --git a/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/kernel/SimFairShareHypervisorTest.kt b/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/kernel/SimFairShareHypervisorTest.kt
index 9db2e6ec..6f32cf46 100644
--- a/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/kernel/SimFairShareHypervisorTest.kt
+++ b/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/kernel/SimFairShareHypervisorTest.kt
@@ -38,6 +38,8 @@ import org.opendc.simulator.compute.model.ProcessingNode
 import org.opendc.simulator.compute.model.ProcessingUnit
 import org.opendc.simulator.compute.power.ConstantPowerModel
 import org.opendc.simulator.compute.power.SimplePowerDriver
+import org.opendc.simulator.compute.workload.SimTrace
+import org.opendc.simulator.compute.workload.SimTraceFragment
 import org.opendc.simulator.compute.workload.SimTraceWorkload
 import org.opendc.simulator.core.runBlockingSimulation
 import org.opendc.simulator.flow.FlowEngine
@@ -66,11 +68,11 @@ internal class SimFairShareHypervisorTest {
         val duration = 5 * 60L
         val workloadA =
             SimTraceWorkload(
-                sequenceOf(
-                    SimTraceWorkload.Fragment(0, duration * 1000, 28.0, 1),
-                    SimTraceWorkload.Fragment(duration * 1000, duration * 1000, 3500.0, 1),
-                    SimTraceWorkload.Fragment(duration * 2000, duration * 1000, 0.0, 1),
-                    SimTraceWorkload.Fragment(duration * 3000, duration * 1000, 183.0, 1)
+                SimTrace.ofFragments(
+                    SimTraceFragment(0, duration * 1000, 28.0, 1),
+                    SimTraceFragment(duration * 1000, duration * 1000, 3500.0, 1),
+                    SimTraceFragment(duration * 2000, duration * 1000, 0.0, 1),
+                    SimTraceFragment(duration * 3000, duration * 1000, 183.0, 1)
                 ),
             )
 
@@ -106,20 +108,20 @@ internal class SimFairShareHypervisorTest {
         val duration = 5 * 60L
         val workloadA =
             SimTraceWorkload(
-                sequenceOf(
-                    SimTraceWorkload.Fragment(0, duration * 1000, 28.0, 1),
-                    SimTraceWorkload.Fragment(duration * 1000, duration * 1000, 3500.0, 1),
-                    SimTraceWorkload.Fragment(duration * 2000, duration * 1000, 0.0, 1),
-                    SimTraceWorkload.Fragment(duration * 3000, duration * 1000, 183.0, 1)
+                SimTrace.ofFragments(
+                    SimTraceFragment(0, duration * 1000, 28.0, 1),
+                    SimTraceFragment(duration * 1000, duration * 1000, 3500.0, 1),
+                    SimTraceFragment(duration * 2000, duration * 1000, 0.0, 1),
+                    SimTraceFragment(duration * 3000, duration * 1000, 183.0, 1)
                 ),
             )
         val workloadB =
             SimTraceWorkload(
-                sequenceOf(
-                    SimTraceWorkload.Fragment(0, duration * 1000, 28.0, 1),
-                    SimTraceWorkload.Fragment(duration * 1000, duration * 1000, 3100.0, 1),
-                    SimTraceWorkload.Fragment(duration * 2000, duration * 1000, 0.0, 1),
-                    SimTraceWorkload.Fragment(duration * 3000, duration * 1000, 73.0, 1)
+                SimTrace.ofFragments(
+                    SimTraceFragment(0, duration * 1000, 28.0, 1),
+                    SimTraceFragment(duration * 1000, duration * 1000, 3100.0, 1),
+                    SimTraceFragment(duration * 2000, duration * 1000, 0.0, 1),
+                    SimTraceFragment(duration * 3000, duration * 1000, 73.0, 1)
                 )
             )
 
@@ -201,20 +203,20 @@ internal class SimFairShareHypervisorTest {
         val duration = 5 * 60L
         val workloadA =
             SimTraceWorkload(
-                sequenceOf(
-                    SimTraceWorkload.Fragment(0, duration * 1000, 0.0, 1),
-                    SimTraceWorkload.Fragment(duration * 1000, duration * 1000, 28.0, 1),
-                    SimTraceWorkload.Fragment(duration * 2000, duration * 1000, 3500.0, 1),
-                    SimTraceWorkload.Fragment(duration * 3000, duration * 1000, 183.0, 1)
+                SimTrace.ofFragments(
+                    SimTraceFragment(0, duration * 1000, 0.0, 1),
+                    SimTraceFragment(duration * 1000, duration * 1000, 28.0, 1),
+                    SimTraceFragment(duration * 2000, duration * 1000, 3500.0, 1),
+                    SimTraceFragment(duration * 3000, duration * 1000, 183.0, 1)
                 ),
             )
         val workloadB =
             SimTraceWorkload(
-                sequenceOf(
-                    SimTraceWorkload.Fragment(0, duration * 1000, 0.0, 1),
-                    SimTraceWorkload.Fragment(duration * 1000, duration * 1000, 28.0, 1),
-                    SimTraceWorkload.Fragment(duration * 2000, duration * 1000, 3100.0, 1),
-                    SimTraceWorkload.Fragment(duration * 3000, duration * 1000, 73.0, 1)
+                SimTrace.ofFragments(
+                    SimTraceFragment(0, duration * 1000, 0.0, 1),
+                    SimTraceFragment(duration * 1000, duration * 1000, 28.0, 1),
+                    SimTraceFragment(duration * 2000, duration * 1000, 3100.0, 1),
+                    SimTraceFragment(duration * 3000, duration * 1000, 73.0, 1)
                 )
             )
 
diff --git a/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/kernel/SimSpaceSharedHypervisorTest.kt b/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/kernel/SimSpaceSharedHypervisorTest.kt
index b05ffd22..02d308ff 100644
--- a/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/kernel/SimSpaceSharedHypervisorTest.kt
+++ b/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/kernel/SimSpaceSharedHypervisorTest.kt
@@ -36,9 +36,7 @@ import org.opendc.simulator.compute.model.ProcessingNode
 import org.opendc.simulator.compute.model.ProcessingUnit
 import org.opendc.simulator.compute.power.ConstantPowerModel
 import org.opendc.simulator.compute.power.SimplePowerDriver
-import org.opendc.simulator.compute.workload.SimFlopsWorkload
-import org.opendc.simulator.compute.workload.SimRuntimeWorkload
-import org.opendc.simulator.compute.workload.SimTraceWorkload
+import org.opendc.simulator.compute.workload.*
 import org.opendc.simulator.core.runBlockingSimulation
 import org.opendc.simulator.flow.FlowEngine
 
@@ -66,11 +64,11 @@ internal class SimSpaceSharedHypervisorTest {
         val duration = 5 * 60L
         val workloadA =
             SimTraceWorkload(
-                sequenceOf(
-                    SimTraceWorkload.Fragment(0, duration * 1000, 28.0, 1),
-                    SimTraceWorkload.Fragment(duration * 1000, duration * 1000, 3500.0, 1),
-                    SimTraceWorkload.Fragment(duration * 2000, duration * 1000, 0.0, 1),
-                    SimTraceWorkload.Fragment(duration * 3000, duration * 1000, 183.0, 1)
+                SimTrace.ofFragments(
+                    SimTraceFragment(0, duration * 1000, 28.0, 1),
+                    SimTraceFragment(duration * 1000, duration * 1000, 3500.0, 1),
+                    SimTraceFragment(duration * 2000, duration * 1000, 0.0, 1),
+                    SimTraceFragment(duration * 3000, duration * 1000, 183.0, 1)
                 ),
             )
 
diff --git a/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/workload/SimTraceWorkloadTest.kt b/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/workload/SimTraceWorkloadTest.kt
index cdbffe4b..574860e8 100644
--- a/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/workload/SimTraceWorkloadTest.kt
+++ b/opendc-simulator/opendc-simulator-compute/src/test/kotlin/org/opendc/simulator/compute/workload/SimTraceWorkloadTest.kt
@@ -58,11 +58,11 @@ class SimTraceWorkloadTest {
         )
 
         val workload = SimTraceWorkload(
-            sequenceOf(
-                SimTraceWorkload.Fragment(0, 1000, 2 * 28.0, 2),
-                SimTraceWorkload.Fragment(1000, 1000, 2 * 3100.0, 2),
-                SimTraceWorkload.Fragment(2000, 1000, 0.0, 2),
-                SimTraceWorkload.Fragment(3000, 1000, 2 * 73.0, 2)
+            SimTrace.ofFragments(
+                SimTraceFragment(0, 1000, 2 * 28.0, 2),
+                SimTraceFragment(1000, 1000, 2 * 3100.0, 2),
+                SimTraceFragment(2000, 1000, 0.0, 2),
+                SimTraceFragment(3000, 1000, 2 * 73.0, 2)
             ),
             offset = 0
         )
@@ -85,11 +85,11 @@ class SimTraceWorkloadTest {
         )
 
         val workload = SimTraceWorkload(
-            sequenceOf(
-                SimTraceWorkload.Fragment(0, 1000, 2 * 28.0, 2),
-                SimTraceWorkload.Fragment(1000, 1000, 2 * 3100.0, 2),
-                SimTraceWorkload.Fragment(2000, 1000, 0.0, 2),
-                SimTraceWorkload.Fragment(3000, 1000, 2 * 73.0, 2)
+            SimTrace.ofFragments(
+                SimTraceFragment(0, 1000, 2 * 28.0, 2),
+                SimTraceFragment(1000, 1000, 2 * 3100.0, 2),
+                SimTraceFragment(2000, 1000, 0.0, 2),
+                SimTraceFragment(3000, 1000, 2 * 73.0, 2)
             ),
             offset = 1000
         )
@@ -112,11 +112,11 @@ class SimTraceWorkloadTest {
         )
 
         val workload = SimTraceWorkload(
-            sequenceOf(
-                SimTraceWorkload.Fragment(0, 1000, 2 * 28.0, 2),
-                SimTraceWorkload.Fragment(1000, 1000, 2 * 3100.0, 2),
-                SimTraceWorkload.Fragment(2000, 1000, 0.0, 2),
-                SimTraceWorkload.Fragment(3000, 1000, 2 * 73.0, 2)
+            SimTrace.ofFragments(
+                SimTraceFragment(0, 1000, 2 * 28.0, 2),
+                SimTraceFragment(1000, 1000, 2 * 3100.0, 2),
+                SimTraceFragment(2000, 1000, 0.0, 2),
+                SimTraceFragment(3000, 1000, 2 * 73.0, 2)
             ),
             offset = 0
         )
@@ -140,11 +140,11 @@ class SimTraceWorkloadTest {
         )
 
         val workload = SimTraceWorkload(
-            sequenceOf(
-                SimTraceWorkload.Fragment(0, 1000, 2 * 28.0, 2),
-                SimTraceWorkload.Fragment(1000, 1000, 2 * 3100.0, 2),
-                SimTraceWorkload.Fragment(2000, 1000, 0.0, 0),
-                SimTraceWorkload.Fragment(3000, 1000, 2 * 73.0, 2)
+            SimTrace.ofFragments(
+                SimTraceFragment(0, 1000, 2 * 28.0, 2),
+                SimTraceFragment(1000, 1000, 2 * 3100.0, 2),
+                SimTraceFragment(2000, 1000, 0.0, 0),
+                SimTraceFragment(3000, 1000, 2 * 73.0, 2)
             ),
             offset = 0
         )