summaryrefslogtreecommitdiff
path: root/opendc-web
diff options
context:
space:
mode:
Diffstat (limited to 'opendc-web')
-rw-r--r--opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt11
1 files changed, 4 insertions, 7 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 c958bdb2..9a1319b6 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
@@ -23,7 +23,6 @@
package org.opendc.web.runner
import mu.KotlinLogging
-import org.opendc.compute.api.Server
import org.opendc.compute.workload.*
import org.opendc.compute.workload.telemetry.ComputeMetricReader
import org.opendc.compute.workload.topology.HostSpec
@@ -208,7 +207,7 @@ public class OpenDCRunner(
val phenomena = scenario.phenomena
val computeScheduler = createComputeScheduler(scenario.schedulerName, seeder)
val workload = trace(workloadName).sampleByLoad(workloadFraction)
- val (vms, interferenceModel) = workload.resolve(workloadLoader, seeder)
+ val vms = workload.resolve(workloadLoader, seeder)
val failureModel =
if (phenomena.failures)
@@ -220,17 +219,15 @@ public class OpenDCRunner(
coroutineContext,
clock,
computeScheduler,
- failureModel,
- interferenceModel.takeIf { phenomena.interference }
+ seed = 0L,
)
- val servers = mutableListOf<Server>()
- val reader = ComputeMetricReader(this, clock, simulator.service, servers, monitor)
+ val reader = ComputeMetricReader(this, clock, simulator.service, monitor)
try {
// Instantiate the topology onto the simulator
simulator.apply(topology)
// Run workload trace
- simulator.run(vms, seeder.nextLong(), servers)
+ simulator.run(vms, failureModel = failureModel, interference = phenomena.interference)
val serviceMetrics = simulator.service.getSchedulerStats()
logger.debug {