diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-02-28 13:29:55 +0100 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2020-02-28 13:29:55 +0100 |
| commit | 0c19b32433e2086e72e0d22595f4daa6ef04b64b (patch) | |
| tree | 149b03d55d90a2047a428427c509233e69ddd19f /opendc/opendc-experiments-sc20/src/main/kotlin/com | |
| parent | edc5234be4440499b15450f66c9e699f8ed8cc71 (diff) | |
| parent | 6c295a937834cf0e5b061bade1dddf66e4997648 (diff) | |
Merge branch 'bug/2.x-vm-units' into 'feat/2.x'
bug: Fix timing issues to to unit differences
See merge request opendc/opendc-simulator!32
Diffstat (limited to 'opendc/opendc-experiments-sc20/src/main/kotlin/com')
2 files changed, 12 insertions, 6 deletions
diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/Sc20HypervisorMonitor.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/Sc20HypervisorMonitor.kt index fc0c2686..e095d300 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/Sc20HypervisorMonitor.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/Sc20HypervisorMonitor.kt @@ -2,13 +2,15 @@ package com.atlarge.opendc.experiments.sc20 import com.atlarge.opendc.compute.core.Server import com.atlarge.opendc.compute.virt.monitor.HypervisorMonitor -import java.io.File +import java.io.BufferedWriter +import java.io.Closeable +import java.io.FileWriter -class Sc20HypervisorMonitor : HypervisorMonitor { - private val outputFile = File("sc20-experiment-results.csv") +class Sc20HypervisorMonitor : HypervisorMonitor, Closeable { + private val outputFile = BufferedWriter(FileWriter("sc20-experiment-results.csv")) init { - outputFile.writeText("time,requestedBurst,grantedBurst,numberOfDeployedImages,server\n") + outputFile.write("time,requestedBurst,grantedBurst,numberOfDeployedImages,server\n") } override fun onSliceFinish( @@ -18,6 +20,10 @@ class Sc20HypervisorMonitor : HypervisorMonitor { numberOfDeployedImages: Int, hostServer: Server ) { - outputFile.appendText("$time,$requestedBurst,$grantedBurst,$numberOfDeployedImages,$numberOfDeployedImages,${hostServer.uid}\n") + outputFile.write("$time,$requestedBurst,$grantedBurst,$numberOfDeployedImages,$numberOfDeployedImages,${hostServer.uid}\n") + } + + override fun close() { + outputFile.close() } } 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 439412ba..3882feb7 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 @@ -49,7 +49,7 @@ fun main(args: Array<String>) { return } - val environment = Sc20EnvironmentReader(object {}.javaClass.getResourceAsStream("/env/setup-test.json")) + val environment = Sc20EnvironmentReader(object {}.javaClass.getResourceAsStream("/env/setup-small.json")) .use { it.read() } val token = Channel<Boolean>() |