diff options
| author | Dante Niewenhuis <d.niewenhuis@hotmail.com> | 2025-01-22 14:35:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-22 14:35:21 +0100 |
| commit | 9403af12f5d015497894fab5a2dea93eb094ecaf (patch) | |
| tree | ceae49147e70389b761930677a1d5df5d5047dd8 /opendc-web/opendc-web-runner/src/main/kotlin | |
| parent | 5c193e77812c306e968e9fae6855ebbc39cdf0fc (diff) | |
Simplified the WorkloadLoader into a single class that can be extended when new workload types are added (#294)
Diffstat (limited to 'opendc-web/opendc-web-runner/src/main/kotlin')
| -rw-r--r-- | opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt index 7ceb32e6..8684132c 100644 --- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt +++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt @@ -35,8 +35,6 @@ import org.opendc.compute.topology.specs.ClusterSpec import org.opendc.compute.topology.specs.HostSpec import org.opendc.compute.topology.specs.PowerSourceSpec import org.opendc.compute.workload.ComputeWorkloadLoader -import org.opendc.compute.workload.sampleByLoad -import org.opendc.compute.workload.trace import org.opendc.experiments.base.runner.replay import org.opendc.simulator.compute.cpu.CpuPowerModels import org.opendc.simulator.compute.models.CpuModel @@ -273,9 +271,11 @@ public class OpenDCRunner( Provisioner(dispatcher, seed).use { provisioner -> - val workload = - trace(scenario.workload.trace.id).sampleByLoad(scenario.workload.samplingFraction) - val vms = workload.resolve(workloadLoader, Random(seed)) +// val workload = +// trace(scenario.workload.trace.id).sampleByLoad(scenario.workload.samplingFraction) +// val vms = workload.resolve(workloadLoader, Random(seed)) + + val vms = workloadLoader.sampleByLoad(scenario.workload.samplingFraction) val startTime = vms.minOf { it.submissionTime }.toEpochMilli() provisioner.runSteps( |