summaryrefslogtreecommitdiff
path: root/opendc-format/src
diff options
context:
space:
mode:
Diffstat (limited to 'opendc-format/src')
-rw-r--r--opendc-format/src/main/kotlin/org/opendc/format/trace/bitbrains/BitbrainsTraceReader.kt15
1 files changed, 1 insertions, 14 deletions
diff --git a/opendc-format/src/main/kotlin/org/opendc/format/trace/bitbrains/BitbrainsTraceReader.kt b/opendc-format/src/main/kotlin/org/opendc/format/trace/bitbrains/BitbrainsTraceReader.kt
index 769b2b13..aaf8a240 100644
--- a/opendc-format/src/main/kotlin/org/opendc/format/trace/bitbrains/BitbrainsTraceReader.kt
+++ b/opendc-format/src/main/kotlin/org/opendc/format/trace/bitbrains/BitbrainsTraceReader.kt
@@ -24,8 +24,6 @@ package org.opendc.format.trace.bitbrains
import org.opendc.format.trace.TraceEntry
import org.opendc.format.trace.TraceReader
-import org.opendc.simulator.compute.interference.IMAGE_PERF_INTERFERENCE_MODEL
-import org.opendc.simulator.compute.interference.PerformanceInterferenceModel
import org.opendc.simulator.compute.workload.SimTraceWorkload
import org.opendc.simulator.compute.workload.SimWorkload
import java.io.BufferedReader
@@ -38,12 +36,8 @@ import kotlin.math.min
* A [TraceReader] for the public VM workload trace format.
*
* @param traceDirectory The directory of the traces.
- * @param performanceInterferenceModel The performance model covering the workload in the VM trace.
*/
-public class BitbrainsTraceReader(
- traceDirectory: File,
- performanceInterferenceModel: PerformanceInterferenceModel
-) : TraceReader<SimWorkload> {
+public class BitbrainsTraceReader(traceDirectory: File) : TraceReader<SimWorkload> {
/**
* The internal iterator to use for this reader.
*/
@@ -123,12 +117,6 @@ public class BitbrainsTraceReader(
val uuid = UUID(0L, vmId)
- val relevantPerformanceInterferenceModelItems =
- PerformanceInterferenceModel(
- performanceInterferenceModel.items.filter { it.workloadNames.contains(vmId.toString()) }
- .toSortedSet()
- )
-
val workload = SimTraceWorkload(flopsHistory.asSequence())
entries[vmId] = TraceEntry(
uuid,
@@ -136,7 +124,6 @@ public class BitbrainsTraceReader(
startTime,
workload,
mapOf(
- IMAGE_PERF_INTERFERENCE_MODEL to relevantPerformanceInterferenceModelItems,
"cores" to cores,
"required-memory" to requiredMemory,
"workload" to workload