feat: Pass all relevant SC20 parameters as arguments

This also includes a list of selected VMs, with the aim of only running those (for workload intensity sampling).

1 files changed, 14 insertions, 4 deletions

diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt
index d4656823..70f56165 100644
--- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt
+++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20TraceReader.kt
@@ -45,7 +45,8 @@ import java.util.UUID
  */
 class Sc20TraceReader(
     traceDirectory: File,
-    performanceInterferenceModel: PerformanceInterferenceModel
+    performanceInterferenceModel: PerformanceInterferenceModel,
+    selectedVms: List<String>
 ) : TraceReader<VmWorkload> {
     /**
      * The internal iterator to use for this reader.
@@ -65,9 +66,18 @@ class Sc20TraceReader(
         val provisionedMemoryCol = 20
         val traceInterval = 5 * 60 * 1000L
 
-        traceDirectory.walk()
-            .filterNot { it.isDirectory }
-            .filter { it.extension == "csv" || it.extension == "txt" }
+        val vms = if (selectedVms.isEmpty()) {
+            traceDirectory.walk()
+                .filterNot { it.isDirectory }
+                .filter { it.extension == "csv" || it.extension == "txt" }
+                .toList()
+        } else {
+            selectedVms.map {
+                File(traceDirectory, it)
+            }
+        }
+
+        vms
             .forEach { vmFile ->
                 println(vmFile)
                 val flopsHistory = mutableListOf<FlopsHistoryFragment>()