diff options
Diffstat (limited to 'opendc-compute')
2 files changed, 20 insertions, 1 deletions
diff --git a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java index 8ff78dae..ad562714 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java +++ b/opendc-compute/opendc-compute-simulator/src/main/java/org/opendc/compute/simulator/service/ComputeService.java @@ -468,6 +468,10 @@ public final class ComputeService implements AutoCloseable, CarbonReceiver { void addTerminatedTask(ServiceTask task) { + if (!task.hasChildren()) { + return; + } + for (int childTaskId : task.getChildren()) { SchedulingRequest request = blockedTasks.get(childTaskId); if (request != null) { diff --git a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/scheduler/ComputeSchedulers.kt b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/scheduler/ComputeSchedulers.kt index 01804a70..fc40fac0 100644 --- a/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/scheduler/ComputeSchedulers.kt +++ b/opendc-compute/opendc-compute-simulator/src/main/kotlin/org/opendc/compute/simulator/scheduler/ComputeSchedulers.kt @@ -61,7 +61,22 @@ public fun createPrefabComputeScheduler( clock: InstantSource, numHosts: Int = 1000, ): ComputeScheduler { - return createPrefabComputeScheduler(ComputeSchedulerEnum.valueOf(name.uppercase()), seeder, clock, numHosts) + val trimmedName = name.trim() + + // Find the enum value case-insensitively + val schedulerEnum = + ComputeSchedulerEnum.entries.find { + it.name.equals(trimmedName, ignoreCase = true) + } + + if (schedulerEnum == null) { + val validNames = ComputeSchedulerEnum.entries.joinToString(", ") { it.name } + throw IllegalArgumentException( + "Invalid scheduler name: '$name'. Valid scheduler names are: $validNames (case-insensitive)", + ) + } + + return createPrefabComputeScheduler(schedulerEnum, seeder, clock, numHosts) } /** |