diff options
| author | Dante Niewenhuis <d.niewenhuis@hotmail.com> | 2024-02-16 15:11:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-16 15:11:05 +0100 |
| commit | d28002a3c151d198298574312f32f1cb43f3a660 (patch) | |
| tree | 9bdb705dcaf6f99f0189cb2d62421e555635bec2 /opendc-compute/opendc-compute-simulator/src | |
| parent | 29f3fd2f2b88b68524e54b9ed00cce5fd6b6c949 (diff) | |
Metric update (#205)
* Updated metrics to consistently be ms
* Updated metrics to consistently be ms
* Updated metric documentation on the site
* Updated some tests to work with the updated metrics
Diffstat (limited to 'opendc-compute/opendc-compute-simulator/src')
2 files changed, 12 insertions, 12 deletions
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 461a33f0..16ded689 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 @@ -248,10 +248,10 @@ public class SimHost( counters.sync() return HostCpuStats( - counters.cpuActiveTime / 1000L, - counters.cpuIdleTime / 1000L, - counters.cpuStealTime / 1000L, - counters.cpuLostTime / 1000L, + counters.cpuActiveTime, + counters.cpuIdleTime, + counters.cpuStealTime, + counters.cpuLostTime, hypervisor.cpuCapacity, hypervisor.cpuDemand, hypervisor.cpuUsage, 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 0f6618ad..e9bac8db 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 @@ -128,9 +128,9 @@ internal class SimHostTest { val cpuStats = host.getCpuStats() assertAll( - { assertEquals(639, cpuStats.activeTime, "Active time does not match") }, - { assertEquals(2360, cpuStats.idleTime, "Idle time does not match") }, - { assertEquals(56, cpuStats.stealTime, "Steal time does not match") }, + { assertEquals(639564, cpuStats.activeTime, "Active time does not match") }, + { assertEquals(2360433, cpuStats.idleTime, "Idle time does not match") }, + { assertEquals(56251, cpuStats.stealTime, "Steal time does not match") }, { assertEquals(1499999, timeSource.millis()) } ) } @@ -215,9 +215,9 @@ internal class SimHostTest { val cpuStats = host.getCpuStats() assertAll( - { assertEquals(658, cpuStats.activeTime, "Active time does not match") }, - { assertEquals(2341, cpuStats.idleTime, "Idle time does not match") }, - { assertEquals(637, cpuStats.stealTime, "Steal time does not match") }, + { assertEquals(658502, cpuStats.activeTime, "Active time does not match") }, + { assertEquals(2341496, cpuStats.idleTime, "Idle time does not match") }, + { assertEquals(637504, cpuStats.stealTime, "Steal time does not match") }, { assertEquals(1499999, timeSource.millis()) } ) } @@ -287,8 +287,8 @@ internal class SimHostTest { val guestSysStats = host.getSystemStats(server) assertAll( - { assertEquals(1770, cpuStats.idleTime, "Idle time does not match") }, - { assertEquals(639, cpuStats.activeTime, "Active time does not match") }, + { assertEquals(1770344, cpuStats.idleTime, "Idle time does not match") }, + { assertEquals(639653, cpuStats.activeTime, "Active time does not match") }, { assertEquals(1204999, sysStats.uptime.toMillis(), "Uptime does not match") }, { assertEquals(300000, sysStats.downtime.toMillis(), "Downtime does not match") }, { assertEquals(1204999, guestSysStats.uptime.toMillis(), "Guest uptime does not match") }, |