From 3f05c61faeb94a2f1c920d87a6ca8bde34d551e0 Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Thu, 5 Sep 2024 15:17:58 +0200 Subject: Sim trace update (#249) * Started on reimplementing the SimTrace implementation * updated trace format. Fragments now do not have a deadline, but a duration. The Fragments are executed in order. --- .../experiments/base/ScenarioIntegrationTest.kt | 16 ++++++++-------- .../trace/bitbrains-small/fragments.parquet | Bin 2163354 -> 717069 bytes .../resources/trace/bitbrains-small/tasks.parquet | Bin 2723 -> 5525 bytes 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'opendc-experiments/opendc-experiments-base/src') 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 301d507b..c6ae5180 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 @@ -120,12 +120,12 @@ class ScenarioIntegrationTest { { assertEquals(0, monitor.tasksActive, "All VMs should finish after a run") }, { assertEquals(0, monitor.attemptsFailure, "No VM should be unscheduled") }, { assertEquals(0, monitor.tasksPending, "No VM should not be in the queue") }, - { assertEquals(43795971955, monitor.idleTime) { "Incorrect idle time" } }, - { assertEquals(2864995687, monitor.activeTime) { "Incorrect active time" } }, - { assertEquals(148, monitor.stealTime) { "Incorrect steal time" } }, + { assertEquals(43101695530, monitor.idleTime) { "Incorrect idle time" } }, + { assertEquals(3489503997, monitor.activeTime) { "Incorrect active time" } }, + { assertEquals(142, monitor.stealTime) { "Incorrect steal time" } }, { assertEquals(0, monitor.lostTime) { "Incorrect lost time" } }, - { assertEquals(3.3017632018246904E7, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, - { assertEquals(9.905193072307465E9, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, + { assertEquals(3.3388920269258898E7, monitor.powerDraw, 1E4) { "Incorrect power draw" } }, + { assertEquals(1.0016142948422823E10, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, ) } @@ -162,12 +162,12 @@ class ScenarioIntegrationTest { // Note that these values have been verified beforehand assertAll( - { assertEquals(1374591279, monitor.idleTime) { "Idle time incorrect" } }, - { assertEquals(1217660672, monitor.activeTime) { "Active time incorrect" } }, + { assertEquals(1373412033, monitor.idleTime) { "Idle time incorrect" } }, + { assertEquals(1217675912, monitor.activeTime) { "Active time incorrect" } }, { assertEquals(19, 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(7.617527900379665E8, monitor.energyUsage, 1E4) { "Incorrect energy usage" } }, ) } diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/fragments.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/fragments.parquet index 9d953956..240f58e3 100644 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/fragments.parquet and b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/fragments.parquet differ diff --git a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/tasks.parquet b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/tasks.parquet index 9cded35f..8e9dcea7 100644 Binary files a/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/tasks.parquet and b/opendc-experiments/opendc-experiments-base/src/test/resources/trace/bitbrains-small/tasks.parquet differ -- cgit v1.2.3