Merge branch 'refactor/2.x-vm-improvements' into 'feat/2.x'

Improve design of workload modelling

See merge request opendc/opendc-simulator!29

1 files changed, 4 insertions, 4 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 5a277dff..7b1c2dbf 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
@@ -8,16 +8,16 @@ class Sc20HypervisorMonitor : HypervisorMonitor {
     private val outputFile = File("sc20-experiment-results.csv")
 
     init {
-        outputFile.appendText("time,totalRequestedCpuTime,totalCpuTimeCapacity,numberOfDeployedImages,server\n")
+        outputFile.writeText("time,totalRequestedBurst,totalGrantedBurst,numberOfDeployedImages,server\n")
     }
 
     override fun onSliceFinish(
         time: Long,
-        totalRequestedCpuTime: Long,
-        totalCpuTimeCapacity: Long,
+        totalRequestedBurst: Long,
+        totalGrantedBurst: Long,
         numberOfDeployedImages: Int,
         hostServer: Server
     ) {
-        outputFile.appendText("$time,$totalRequestedCpuTime,$totalCpuTimeCapacity,$numberOfDeployedImages,$numberOfDeployedImages,${hostServer.uid}\n")
+        outputFile.appendText("$time,$totalRequestedBurst,$totalGrantedBurst,$numberOfDeployedImages,$numberOfDeployedImages,${hostServer.uid}\n")
     }
 }