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 --- .../kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt | 5 +++++ .../src/main/resources/env/performance-interference.json | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 opendc/opendc-experiments-sc20/src/main/resources/env/performance-interference.json (limited to 'opendc/opendc-experiments-sc20/src/main') diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt index daa40193..7a67fc23 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt @@ -34,6 +34,7 @@ import com.atlarge.opendc.compute.metal.service.ProvisioningService import com.atlarge.opendc.compute.virt.service.SimpleVirtProvisioningService import com.atlarge.opendc.compute.virt.service.allocation.AvailableMemoryAllocationPolicy import com.atlarge.opendc.format.environment.sc20.Sc20EnvironmentReader +import com.atlarge.opendc.format.trace.sc20.Sc20PerformanceInterferenceReader import com.atlarge.opendc.format.trace.vm.VmTraceReader import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.delay @@ -67,6 +68,10 @@ fun main(args: Array) { val environment = Sc20EnvironmentReader(object {}.javaClass.getResourceAsStream("/env/setup-small.json")) .use { it.construct(root) } + val performanceInterferenceModel = Sc20PerformanceInterferenceReader( + object {}.javaClass.getResourceAsStream("/env/performance-interference.json") + ).construct() + println(simulationContext.clock.instant()) val scheduler = SimpleVirtProvisioningService( diff --git a/opendc/opendc-experiments-sc20/src/main/resources/env/performance-interference.json b/opendc/opendc-experiments-sc20/src/main/resources/env/performance-interference.json new file mode 100644 index 00000000..0d4f101c --- /dev/null +++ b/opendc/opendc-experiments-sc20/src/main/resources/env/performance-interference.json @@ -0,0 +1,2 @@ +[ +] -- 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 --- .../main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt | 2 +- .../src/main/resources/env/performance-interference.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'opendc/opendc-experiments-sc20/src/main') diff --git a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt index 7a67fc23..f4be75fa 100644 --- a/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt +++ b/opendc/opendc-experiments-sc20/src/main/kotlin/com/atlarge/opendc/experiments/sc20/TestExperiment.kt @@ -81,7 +81,7 @@ fun main(args: Array) { Sc20HypervisorMonitor() ) - val reader = VmTraceReader(File(args[0])) + val reader = VmTraceReader(File(args[0]), performanceInterferenceModel) delay(1376314846 * 1000L) while (reader.hasNext()) { val (time, workload) = reader.next() diff --git a/opendc/opendc-experiments-sc20/src/main/resources/env/performance-interference.json b/opendc/opendc-experiments-sc20/src/main/resources/env/performance-interference.json index 0d4f101c..e2437693 100644 --- a/opendc/opendc-experiments-sc20/src/main/resources/env/performance-interference.json +++ b/opendc/opendc-experiments-sc20/src/main/resources/env/performance-interference.json @@ -1,2 +1,6 @@ [ + { + "vms": [545, 223], + "performanceScore": 0.6 + } ] -- cgit v1.2.3