diff options
| author | Dante Niewenhuis <d.niewenhuis@hotmail.com> | 2024-10-25 13:32:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-25 13:32:41 +0200 |
| commit | 5a365dbc068f2a8cdfa9813c39cc84bb30e15637 (patch) | |
| tree | 72716d562787b85e03cdc7fe1d30c827054d25a0 /opendc-experiments/opendc-experiments-m3sa | |
| parent | 27f5b7dcb05aefdab9b762175d538931face0aba (diff) | |
Rewrote the FlowEngine (#256)
* Removed unused components. Updated tests.
Improved checkpointing model
Improved model, started with SimPowerSource
implemented FailureModels and Checkpointing
First working version
midway commit
first update
All simulation are now run with a single CPU and single MemoryUnit. multi CPUs are combined into one. This is for performance and explainability.
* fixed merge conflicts
* Updated M3SA paths.
* Fixed small typo
Diffstat (limited to 'opendc-experiments/opendc-experiments-m3sa')
| -rw-r--r-- | opendc-experiments/opendc-experiments-m3sa/build.gradle.kts | 2 | ||||
| -rw-r--r-- | opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/M3saAnalyzer.kt (renamed from opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/M3saAnalyzer.kt) | 2 | ||||
| -rw-r--r-- | opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt | 5 | ||||
| -rw-r--r-- | opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/opendc-experiments/opendc-experiments-m3sa/build.gradle.kts b/opendc-experiments/opendc-experiments-m3sa/build.gradle.kts index 6530390b..9347e525 100644 --- a/opendc-experiments/opendc-experiments-m3sa/build.gradle.kts +++ b/opendc-experiments/opendc-experiments-m3sa/build.gradle.kts @@ -31,7 +31,6 @@ dependencies { api(libs.kotlinx.coroutines) testImplementation(projects.opendcSimulator.opendcSimulatorCore) - api(projects.opendcCompute.opendcComputeService) api(projects.opendcCompute.opendcComputeSimulator) implementation(libs.clikt) @@ -42,7 +41,6 @@ dependencies { implementation(project(mapOf("path" to ":opendc-simulator:opendc-simulator-core"))) implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-workload"))) - implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-telemetry"))) implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-topology"))) implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-carbon"))) implementation(project(mapOf("path" to ":opendc-compute:opendc-compute-failure"))) diff --git a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/M3saAnalyzer.kt b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/M3saAnalyzer.kt index 6b8f8422..545ed656 100644 --- a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/M3saAnalyzer.kt +++ b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/M3saAnalyzer.kt @@ -20,6 +20,8 @@ * SOFTWARE. */ +package org.opendc.experiments.m3sa + import kotlin.io.path.Path /** diff --git a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt index 43597ff5..8036e5b7 100644 --- a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt +++ b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SACli.kt @@ -22,7 +22,7 @@ @file:JvmName("M3SACli") -package org.opendc.experiments.base.runner +package org.opendc.experiments.m3sa.runner import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.default @@ -30,8 +30,9 @@ import com.github.ajalt.clikt.parameters.options.defaultLazy import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.types.file import com.github.ajalt.clikt.parameters.types.int -import m3saAnalyze +import org.opendc.experiments.base.runner.runExperiment import org.opendc.experiments.base.scenario.getExperiment +import org.opendc.experiments.m3sa.m3saAnalyze import org.opendc.experiments.m3sa.scenario.getOutputFolder import java.io.File diff --git a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt index 9a61ad17..89daf5f3 100644 --- a/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt +++ b/opendc-experiments/opendc-experiments-m3sa/src/main/kotlin/org/opendc/experiments/m3sa/runner/M3SARunner.kt @@ -22,8 +22,10 @@ @file:JvmName("M3saCliKt") -package org.opendc.experiments.base.runner +package org.opendc.experiments.m3sa.runner +import org.opendc.experiments.base.runner.runScenario +import org.opendc.experiments.base.runner.setupOutputFolderStructure import org.opendc.experiments.base.scenario.Scenario import java.util.concurrent.ForkJoinPool |