From b6153bbf24970a5b4ba103de00e440911dcc8694 Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Mon, 17 Jun 2024 06:14:32 +0200 Subject: Fixed CPU limit problem (#234) * Fixed a problem which caused the CPU limit to be much lower than it should be. AllocationPolicy is now properly exposed to the user * Fixed tests * spotless kotlin --- .../main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'opendc-experiments/opendc-experiments-base/src/main') diff --git a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt index cb4fdd46..5a37a0b9 100644 --- a/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt +++ b/opendc-experiments/opendc-experiments-base/src/main/kotlin/org/opendc/experiments/base/runner/ScenarioRunner.kt @@ -28,7 +28,6 @@ import me.tongfei.progressbar.ProgressBarStyle import org.opendc.compute.carbon.CarbonTrace import org.opendc.compute.carbon.getCarbonTrace import org.opendc.compute.service.ComputeService -import org.opendc.compute.service.scheduler.ComputeSchedulerEnum import org.opendc.compute.service.scheduler.createComputeScheduler import org.opendc.compute.simulator.provisioner.Provisioner import org.opendc.compute.simulator.provisioner.registerComputeMonitor @@ -120,7 +119,7 @@ public fun runScenario( provisioner.runSteps( setupComputeService( serviceDomain, - { createComputeScheduler(ComputeSchedulerEnum.Mem, Random(it.seeder.nextLong())) }, + { createComputeScheduler(scenario.allocationPolicySpec.policyType, Random(it.seeder.nextLong())) }, ), setupHosts(serviceDomain, topology, optimize = true), ) -- cgit v1.2.3