summaryrefslogtreecommitdiff
path: root/simulator
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2021-04-14 17:02:53 +0200
committerFabian Mastenbroek <mail.fabianm@gmail.com>2021-04-14 17:02:53 +0200
commit79976e08aec24a8b773739036db05843aabb6a61 (patch)
treee4b6bf939f24b66ea1e1cc06917b5ebeb8404d15 /simulator
parenteab45064155fd7823a31cba1e779501616475b55 (diff)
exp: Simplify power usage calculation
This change simplifies the conversion from power to energy consumption used in the web runner. Now, we convert straight from J to Wh.
Diffstat (limited to 'simulator')
-rw-r--r--simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/WebExperimentMonitor.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/WebExperimentMonitor.kt b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/WebExperimentMonitor.kt
index 8f39b8ac..c913f82f 100644
--- a/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/WebExperimentMonitor.kt
+++ b/simulator/opendc-runner-web/src/main/kotlin/org/opendc/runner/web/WebExperimentMonitor.kt
@@ -84,7 +84,7 @@ public class WebExperimentMonitor : ExperimentMonitor {
hostAggregateMetrics.totalGrantedBurst + event.grantedBurst,
hostAggregateMetrics.totalOvercommittedBurst + event.overcommissionedBurst,
hostAggregateMetrics.totalInterferedBurst + event.interferedBurst,
- hostAggregateMetrics.totalPowerDraw + (slices * (event.powerDraw / 12)),
+ hostAggregateMetrics.totalPowerDraw + (event.duration * event.powerDraw) / 3600,
hostAggregateMetrics.totalFailureSlices + if (event.host.state != HostState.UP) slices else 0,
hostAggregateMetrics.totalFailureVmSlices + if (event.host.state != HostState.UP) event.vmCount * slices else 0
)