From 841eaeb84a96cb1b20172b1ab293ebef0bb573a5 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 11 Jan 2022 13:53:07 +0100
Subject: fix(simulator): Flush results before accessing counters

This change updates the simulator implementation to flush the active
progress when accessing the hypervisor counters. Previously, if the
counters were accessed, while the mux or consumer was in progress, its
counter values were not accurate.
---
 .../src/main/kotlin/org/opendc/compute/simulator/SimHost.kt           | 1 +
 .../src/main/kotlin/org/opendc/compute/simulator/internal/Guest.kt    | 1 +
 .../src/test/kotlin/org/opendc/compute/simulator/SimHostTest.kt       | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'opendc-compute')

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 43f33f27..4eb6392e 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
@@ -418,6 +418,7 @@ public class SimHost(
      */
     private fun collectCpuTime(result: ObservableLongMeasurement) {
         val counters = hypervisor.counters
+        counters.flush()
 
         result.record(counters.cpuActiveTime / 1000L, _activeState)
         result.record(counters.cpuIdleTime / 1000L, _idleState)
diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/internal/Guest.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/internal/Guest.kt
index f49c2824..bb378ee3 100644
--- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/internal/Guest.kt
+++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/internal/Guest.kt
@@ -272,6 +272,7 @@ internal class Guest(
      */
     fun collectCpuTime(result: ObservableLongMeasurement) {
         val counters = machine.counters
+        counters.flush()
 
         result.record(counters.cpuActiveTime / 1000, _activeState)
         result.record(counters.cpuIdleTime / 1000, _idleState)
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 dd13b60c..f0325023 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
@@ -173,7 +173,7 @@ internal class SimHostTest {
 
         assertAll(
             { assertEquals(658, activeTime, "Active time does not match") },
-            { assertEquals(1741, idleTime, "Idle time does not match") },
+            { assertEquals(2341, idleTime, "Idle time does not match") },
             { assertEquals(637, stealTime, "Steal time does not match") },
             { assertEquals(1500001, clock.millis()) }
         )
@@ -278,7 +278,7 @@ internal class SimHostTest {
         meterProvider.close()
 
         assertAll(
-            { assertEquals(1175, idleTime, "Idle time does not match") },
+            { assertEquals(1775, 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") },
-- 
cgit v1.2.3