feat(simulator): Expose CPU time counters directly on hypervisor

This change adds a new interface to the SimHypervisor interface that
exposes the CPU time counters directly. These are derived from the flow
counters and will be used by SimHost to expose them via telemetry.

1 files changed, 10 insertions, 10 deletions

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 d2293be7..26089b6d 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
@@ -170,9 +170,9 @@ internal class SimHostTest {
         reader.close()
 
         assertAll(
-            { assertEquals(659, activeTime, "Active time does not match") },
-            { assertEquals(2342, idleTime, "Idle time does not match") },
-            { assertEquals(638, stealTime, "Steal time does not match") },
+            { assertEquals(658, activeTime, "Active time does not match") },
+            { assertEquals(1741, idleTime, "Idle time does not match") },
+            { assertEquals(637, stealTime, "Steal time does not match") },
             { assertEquals(1500001, clock.millis()) }
         )
     }
@@ -253,7 +253,7 @@ internal class SimHostTest {
             host.spawn(server)
             delay(5000L)
             host.fail()
-            delay(5000L)
+            delay(duration * 1000)
             host.recover()
 
             suspendCancellableCoroutine<Unit> { cont ->
@@ -274,12 +274,12 @@ internal class SimHostTest {
         reader.close()
 
         assertAll(
-            { assertEquals(2661, idleTime, "Idle time does not match") },
-            { assertEquals(339, activeTime, "Active time does not match") },
-            { assertEquals(1195001, uptime, "Uptime does not match") },
-            { assertEquals(5000, downtime, "Downtime does not match") },
-            { assertEquals(1195000, guestUptime, "Guest uptime does not match") },
-            { assertEquals(5000, guestDowntime, "Guest downtime does not match") },
+            { assertEquals(1175, idleTime, "Idle time does not match") },
+            { assertEquals(624, activeTime, "Active time does not match") },
+            { assertEquals(900001, uptime, "Uptime does not match") },
+            { assertEquals(300000, downtime, "Downtime does not match") },
+            { assertEquals(900000, guestUptime, "Guest uptime does not match") },
+            { assertEquals(300000, guestDowntime, "Guest downtime does not match") },
         )
     }