From 2dc44c7283200f4689cc1be15115a8b1cd37d456 Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Mon, 29 Apr 2024 12:48:20 +0200 Subject: Fixed several cpu related bugs, changed input topology (#226) --- .../experiments/base/ScenarioIntegrationTest.kt | 22 ++++++------- .../src/test/resources/env/multi.json | 36 +++++++++------------- .../src/test/resources/env/single.json | 12 +++----- 3 files changed, 31 insertions(+), 39 deletions(-) (limited to 'opendc-experiments') diff --git a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt index 0ab305ee..96e62e80 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt +++ b/opendc-experiments/opendc-experiments-base/src/test/kotlin/org/opendc/experiments/base/ScenarioIntegrationTest.kt @@ -121,12 +121,12 @@ class ScenarioIntegrationTest { { assertEquals(0, monitor.serversActive, "All VMs should finish after a run") }, { assertEquals(0, monitor.attemptsFailure, "No VM should be unscheduled") }, { assertEquals(0, monitor.serversPending, "No VM should not be in the queue") }, - { assertEquals(223379991650, monitor.idleTime) { "Incorrect idle time" } }, - { assertEquals(66977091124, monitor.activeTime) { "Incorrect active time" } }, - { assertEquals(3160267873, monitor.stealTime) { "Incorrect steal time" } }, + { assertEquals(36256553309, monitor.idleTime) { "Incorrect idle time" } }, + { assertEquals(10404414534, monitor.activeTime) { "Incorrect active time" } }, + { assertEquals(54402726811, monitor.stealTime) { "Incorrect steal time" } }, { assertEquals(0, monitor.lostTime) { "Incorrect lost time" } }, - { assertEquals(2.0774585843587227E7, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, - { assertEquals(6.232122296636381E9, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, + { assertEquals(3.804398939214319E7, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, + { assertEquals(1.141307641744099E10, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, ) } @@ -163,12 +163,12 @@ class ScenarioIntegrationTest { // Note that these values have been verified beforehand assertAll( - { assertEquals(10996730092, monitor.idleTime) { "Idle time incorrect" } }, - { assertEquals(9741285381, monitor.activeTime) { "Active time incorrect" } }, - { assertEquals(152, monitor.stealTime) { "Steal time incorrect" } }, + { assertEquals(873236440, monitor.idleTime) { "Idle time incorrect" } }, + { assertEquals(1719015528, monitor.activeTime) { "Active time incorrect" } }, + { assertEquals(8022269916, monitor.stealTime) { "Steal time incorrect" } }, { assertEquals(0, monitor.lostTime) { "Lost time incorrect" } }, - { assertEquals(2539987.394500494, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, - { assertEquals(7.619825262052509E8, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, + { assertEquals(2874229.394500494, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, + { assertEquals(8.622534568334692E8, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, ) } @@ -213,8 +213,8 @@ class ScenarioIntegrationTest { /** * Test a small simulation setup with failures. + * FIXME: Currently failures do not work. reactivate this test when Failures are implemented again */ - @Test fun testFailures() = runSimulation { val seed = 0L diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json b/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json index d23dbfe3..c3a060cc 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/env/multi.json @@ -7,13 +7,11 @@ [ { "name": "H01", - "cpus": - [ - { - "coreCount": 32, - "coreSpeed": 3200 - } - ], + "cpu": + { + "coreCount": 32, + "coreSpeed": 3200 + }, "memory": { "memorySize": 256000 } @@ -27,13 +25,11 @@ { "name": "H02", "count": 6, - "cpus": - [ - { - "coreCount": 8, - "coreSpeed": 2930 - } - ], + "cpu": + { + "coreCount": 8, + "coreSpeed": 2930 + }, "memory": { "memorySize": 64000 } @@ -47,13 +43,11 @@ { "name": "H03", "count": 2, - "cpus": - [ - { - "coreCount": 16, - "coreSpeed": 3200 - } - ], + "cpu": + { + "coreCount": 16, + "coreSpeed": 3200 + }, "memory": { "memorySize": 128000 } diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json b/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json index 2d68b234..f69b21be 100644 --- a/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json +++ b/opendc-experiments/opendc-experiments-base/src/test/resources/env/single.json @@ -7,13 +7,11 @@ [ { "name": "H01", - "cpus": - [ - { - "coreCount": 8, - "coreSpeed": 3200 - } - ], + "cpu": + { + "coreCount": 8, + "coreSpeed": 3200 + }, "memory": { "memorySize": 128000 } -- cgit v1.2.3