Merge branch '2.x-perf-interf-optimization' into '2.x'

Optimize the performance interference model

See merge request opendc/opendc-simulator!50

1 files changed, 6 insertions, 2 deletions

diff --git a/opendc/opendc-core/src/main/kotlin/com/atlarge/opendc/core/workload/PerformanceInterferenceModel.kt b/opendc/opendc-core/src/main/kotlin/com/atlarge/opendc/core/workload/PerformanceInterferenceModel.kt
index e2032ff1..ea110934 100644
--- a/opendc/opendc-core/src/main/kotlin/com/atlarge/opendc/core/workload/PerformanceInterferenceModel.kt
+++ b/opendc/opendc-core/src/main/kotlin/com/atlarge/opendc/core/workload/PerformanceInterferenceModel.kt
@@ -16,12 +16,16 @@ const val IMAGE_PERF_INTERFERENCE_MODEL = "image:performance-interference"
 data class PerformanceInterferenceModel(
     val items: Set<PerformanceInterferenceModelItem>
 ) {
-    fun apply(colocatedWorkloads: Set<Resource>, currentServerLoad: Double): Double {
+    private var intersectingItems: List<PerformanceInterferenceModelItem> = emptyList()
+
+    fun computeIntersectingItems(colocatedWorkloads: Set<Resource>) {
         val colocatedWorkloadIds = colocatedWorkloads.map { it.name }
-        val intersectingItems = items.filter { item ->
+        intersectingItems = items.filter { item ->
             colocatedWorkloadIds.intersect(item.workloadNames).size > 1
         }
+    }
 
+    fun apply(currentServerLoad: Double): Double {
         if (intersectingItems.isEmpty()) {
             return 1.0
         }