diff options
Diffstat (limited to 'opendc-web/opendc-web-runner/src')
2 files changed, 4 insertions, 4 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 9a1b398e..09aaf9fa 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 @@ -29,7 +29,7 @@ import org.opendc.compute.simulator.provisioner.Provisioner import org.opendc.compute.simulator.provisioner.registerComputeMonitor import org.opendc.compute.simulator.provisioner.setupComputeService import org.opendc.compute.simulator.provisioner.setupHosts -import org.opendc.compute.simulator.scheduler.createComputeScheduler +import org.opendc.compute.simulator.scheduler.createPrefabComputeScheduler import org.opendc.compute.simulator.service.ComputeService import org.opendc.compute.topology.specs.ClusterSpec import org.opendc.compute.topology.specs.HostSpec @@ -279,7 +279,7 @@ public class OpenDCRunner( provisioner.runSteps( setupComputeService( serviceDomain, - { createComputeScheduler(scenario.schedulerName, Random(it.seeder.nextLong()), timeSource) }, + { createPrefabComputeScheduler(scenario.schedulerName, Random(it.seeder.nextLong()), timeSource) }, ), registerComputeMonitor(serviceDomain, monitor), setupHosts(serviceDomain, topology, listOf(), startTime), diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt index fbb33593..9288b403 100644 --- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt +++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt @@ -44,14 +44,14 @@ internal class WebComputeMonitor : ComputeMonitor { hostAggregateMetrics.totalLostTime + reader.cpuLostTime, hostAggregateMetrics.totalPowerDraw + reader.energyUsage, hostAggregateMetrics.totalFailureSlices + slices, - hostAggregateMetrics.totalFailureVmSlices + reader.guestsRunning * slices, + hostAggregateMetrics.totalFailureVmSlices + reader.tasksActive * slices, ) hostMetrics.compute(reader.hostInfo.name) { _, prev -> HostMetrics( reader.cpuUsage + (prev?.cpuUsage ?: 0.0), reader.cpuDemand + (prev?.cpuDemand ?: 0.0), - reader.guestsRunning + (prev?.instanceCount ?: 0), + reader.tasksActive + (prev?.instanceCount ?: 0), 1 + (prev?.count ?: 0), ) } |