Merge branch 'feat/2.x-overcommitting' into '2.x'

Implement proper VM scheduler

See merge request opendc/opendc-simulator!41

1 files changed, 1 insertions, 1 deletions

diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt
index ffdf0529..415a7628 100644
--- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt
+++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt
@@ -101,7 +101,7 @@ fun main(args: Array<String>) {
             val reader = Sc20TraceReader(File(traceDirectory), performanceInterferenceModel, selectedVms)
             while (reader.hasNext()) {
                 val (time, workload) = reader.next()
-                delay(max(0, time * 1000 - simulationContext.clock.millis()))
+                delay(max(0, time - simulationContext.clock.millis()))
                 scheduler.deploy(workload.image, monitor, Flavor(workload.image.cores, workload.image.requiredMemory))
             }