From 6c295a937834cf0e5b061bade1dddf66e4997648 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Fri, 28 Feb 2020 12:43:18 +0100
Subject: bug: Fix timing issues to to unit differences

---
 .../opendc/experiments/sc20/Sc20HypervisorMonitor.kt     | 16 +++++++++++-----
 .../atlarge/opendc/experiments/sc20/TestExperiment.kt    |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'opendc/opendc-experiments-sc20/src/main/kotlin')

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>()
-- 
cgit v1.2.3