From 78417251806e079c998380a76ab3533de373289b Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Mon, 2 Mar 2020 13:15:11 +0100 Subject: [ci skip] Add performance interference model start --- .../trace/PerformanceInterferenceModelReader.kt | 38 ++++++++++++++ .../com/atlarge/opendc/format/trace/sc20/Model.kt | 6 +++ .../sc20/Sc20PerformanceInterferenceReader.kt | 61 ++++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/PerformanceInterferenceModelReader.kt create mode 100644 opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Model.kt create mode 100644 opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20PerformanceInterferenceReader.kt (limited to 'opendc/opendc-format/src') diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/PerformanceInterferenceModelReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/PerformanceInterferenceModelReader.kt new file mode 100644 index 00000000..f9ebba3d --- /dev/null +++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/PerformanceInterferenceModelReader.kt @@ -0,0 +1,38 @@ +/* + * MIT License + * + * Copyright (c) 2019 atlarge-research + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package com.atlarge.opendc.format.trace + +import com.atlarge.opendc.core.workload.PerformanceInterferenceModel +import java.io.Closeable + +/** + * An interface for reading descriptions of performance interference models into memory. + */ +interface PerformanceInterferenceModelReader : Closeable { + /** + * Construct a [PerformanceInterferenceModel]. + */ + fun construct(): PerformanceInterferenceModel +} diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Model.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Model.kt new file mode 100644 index 00000000..1eeecb25 --- /dev/null +++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Model.kt @@ -0,0 +1,6 @@ +package com.atlarge.opendc.format.trace.sc20 + +internal data class PerformanceInterferenceEntry( + val vms: List, + val performanceScore: Double +) diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20PerformanceInterferenceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20PerformanceInterferenceReader.kt new file mode 100644 index 00000000..b2d60bb9 --- /dev/null +++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Sc20PerformanceInterferenceReader.kt @@ -0,0 +1,61 @@ +/* + * MIT License + * + * Copyright (c) 2019 atlarge-research + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package com.atlarge.opendc.format.trace.sc20 + +import com.atlarge.opendc.core.workload.PerformanceInterferenceModel +import com.atlarge.opendc.core.workload.PerformanceInterferenceModelItem +import com.atlarge.opendc.format.trace.PerformanceInterferenceModelReader +import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper +import com.fasterxml.jackson.module.kotlin.readValue +import java.io.InputStream +import java.util.UUID + +/** + * A parser for the JSON performance interference setup files used for the SC20 paper. + * + * @param input The input stream to read from. + * @param mapper The Jackson object mapper to use. + */ +class Sc20PerformanceInterferenceReader(input: InputStream, mapper: ObjectMapper = jacksonObjectMapper()) : + PerformanceInterferenceModelReader { + /** + * The environment that was read from the file. + */ + private val performanceInterferenceModel: List = mapper.readValue(input) + + override fun construct(): PerformanceInterferenceModel { + return PerformanceInterferenceModel( + performanceInterferenceModel.map { item -> + PerformanceInterferenceModelItem( + item.vms.map { name -> UUID(0L, name.toLong()) }.toSet(), + item.performanceScore + ) + }.toSet() + ) + } + + override fun close() {} +} -- cgit v1.2.3 From 0dd7ae2ed80fb4f581a3e56a3f7d5d4a920a32b7 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Mon, 2 Mar 2020 17:04:02 +0100 Subject: Move performance interference to image tags --- .../atlarge/opendc/format/trace/vm/VmTraceReader.kt | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'opendc/opendc-format/src') diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt index 2e881a6c..2867e993 100644 --- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt +++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt @@ -28,6 +28,7 @@ import com.atlarge.opendc.compute.core.image.FlopsHistoryFragment import com.atlarge.opendc.compute.core.image.VmImage import com.atlarge.opendc.compute.core.workload.VmWorkload import com.atlarge.opendc.core.User +import com.atlarge.opendc.core.workload.PerformanceInterferenceModel import com.atlarge.opendc.format.trace.TraceEntry import com.atlarge.opendc.format.trace.TraceReader import java.io.BufferedReader @@ -39,8 +40,12 @@ import java.util.UUID * A [TraceReader] for the VM workload trace format. * * @param traceDirectory The directory of the traces. + * @param performanceInterferenceModel The performance model covering the workload in the VM trace. */ -class VmTraceReader(traceDirectory: File) : TraceReader { +class VmTraceReader( + traceDirectory: File, + performanceInterferenceModel: PerformanceInterferenceModel +) : TraceReader { /** * The internal iterator to use for this reader. */ @@ -115,9 +120,21 @@ class VmTraceReader(traceDirectory: File) : TraceReader { } val uuid = UUID(0L, vmId) + + val relevantPerformanceInterferenceModelItems = PerformanceInterferenceModel( + performanceInterferenceModel.items.filter { it.workloadIds.contains(uuid) }.toSet() + ) + val vmWorkload = VmWorkload( uuid, "VM Workload $vmId", UnnamedUser, - VmImage(uuid, vmId.toString(), emptyMap(), flopsHistory, cores, requiredMemory) + VmImage( + uuid, + vmId.toString(), + mapOf("performance-interference" to relevantPerformanceInterferenceModelItems), + flopsHistory, + cores, + requiredMemory + ) ) entries[vmId] = TraceEntryImpl( flopsHistory.firstOrNull()?.tick ?: -1, -- cgit v1.2.3 From 0f75b440d709f8a80efdb441d02b7bd47318a22c Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Wed, 4 Mar 2020 18:32:58 +0100 Subject: Fix file name ktlint suggestion --- .../src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Model.kt | 6 ------ .../opendc/format/trace/sc20/PerformanceInterferenceEntry.kt | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Model.kt create mode 100644 opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/PerformanceInterferenceEntry.kt (limited to 'opendc/opendc-format/src') diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Model.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Model.kt deleted file mode 100644 index 1eeecb25..00000000 --- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/Model.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.atlarge.opendc.format.trace.sc20 - -internal data class PerformanceInterferenceEntry( - val vms: List, - val performanceScore: Double -) diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/PerformanceInterferenceEntry.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/PerformanceInterferenceEntry.kt new file mode 100644 index 00000000..1eeecb25 --- /dev/null +++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/sc20/PerformanceInterferenceEntry.kt @@ -0,0 +1,6 @@ +package com.atlarge.opendc.format.trace.sc20 + +internal data class PerformanceInterferenceEntry( + val vms: List, + val performanceScore: Double +) -- cgit v1.2.3 From 0930e73c319ecd01ecdae47e15f077555c12db0c Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Mon, 9 Mar 2020 20:46:28 +0100 Subject: feat: Define key for performance interference model of image --- .../main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'opendc/opendc-format/src') diff --git a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt index 2867e993..2adf99b1 100644 --- a/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt +++ b/opendc/opendc-format/src/main/kotlin/com/atlarge/opendc/format/trace/vm/VmTraceReader.kt @@ -28,6 +28,7 @@ import com.atlarge.opendc.compute.core.image.FlopsHistoryFragment import com.atlarge.opendc.compute.core.image.VmImage import com.atlarge.opendc.compute.core.workload.VmWorkload import com.atlarge.opendc.core.User +import com.atlarge.opendc.core.workload.IMAGE_PERF_INTERFERENCE_MODEL import com.atlarge.opendc.core.workload.PerformanceInterferenceModel import com.atlarge.opendc.format.trace.TraceEntry import com.atlarge.opendc.format.trace.TraceReader @@ -130,7 +131,7 @@ class VmTraceReader( VmImage( uuid, vmId.toString(), - mapOf("performance-interference" to relevantPerformanceInterferenceModelItems), + mapOf(IMAGE_PERF_INTERFERENCE_MODEL to relevantPerformanceInterferenceModelItems), flopsHistory, cores, requiredMemory -- cgit v1.2.3