summaryrefslogtreecommitdiff
path: root/opendc
diff options
context:
space:
mode:
authorGeorgios Andreadis <g.andreadis@student.tudelft.nl>2020-05-18 15:37:29 +0200
committerGeorgios Andreadis <g.andreadis@student.tudelft.nl>2020-05-18 15:37:29 +0200
commitee494d6ce6f817cf4e9ab0dba0d9f9f1987c0029 (patch)
treec07f3310aa18f8c5c66cebadab285832367feefc /opendc
parentc78d99c198e48dfa1b9f0f22f936ebc9457e5a5b (diff)
parentc9d69376eac927e12a220643bca401c416c0f110 (diff)
Merge branch 'bug/duration' into '2.x'
bug: Report correct duration on shutdown See merge request opendc/opendc-simulator!69
Diffstat (limited to 'opendc')
-rw-r--r--opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt4
1 files changed, 3 insertions, 1 deletions
diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt
index 33978aab..138905a4 100644
--- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt
+++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/experiment/monitor/ParquetExperimentMonitor.kt
@@ -63,7 +63,7 @@ class ParquetExperimentMonitor(val run: Run) : ExperimentMonitor {
driver: VirtDriver,
server: Server
) {
- logger.debug("Host ${server.uid} changed state ${server.state} [$time]")
+ logger.debug { "Host ${server.uid} changed state ${server.state} [$time]" }
val lastServerState = lastServerStates[server]
if (server.state == ServerState.SHUTOFF && lastServerState != null) {
@@ -106,6 +106,8 @@ class ParquetExperimentMonitor(val run: Run) : ExperimentMonitor {
hostServer: Server,
duration: Long
) {
+ lastServerStates[hostServer] = Pair(hostServer.state, time)
+
hostWriter.write(
HostEvent(
time,