diff options
| author | Dante Niewenhuis <d.niewenhuis@hotmail.com> | 2025-10-17 16:39:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-17 16:39:50 +0200 |
| commit | 59898b873eabc72719376854770c55e8d8efaa0f (patch) | |
| tree | ddd209df7c680f814ee67098431070dc7e0d6d3a /opendc-simulator/opendc-simulator-compute/src/main | |
| parent | 4181a4bd51b54a5905be1f46f74c1349776e35c2 (diff) | |
Updated FlowDistributor to use arrays for suppliers instead of maps (#378)
Diffstat (limited to 'opendc-simulator/opendc-simulator-compute/src/main')
| -rw-r--r-- | opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/machine/SimMachine.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/machine/SimMachine.java b/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/machine/SimMachine.java index b746156a..323afc8f 100644 --- a/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/machine/SimMachine.java +++ b/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/machine/SimMachine.java @@ -214,7 +214,7 @@ public class SimMachine { this.psu = new SimPsu(engine); new FlowEdge(this.psu, powerDistributor); this.distributors[ResourceType.POWER.ordinal()] = new MaxMinFairnessFlowDistributor( - engine, 1 + this.machineModel.getGpuModels().size()); // Maybe First fit + engine, 1 + this.machineModel.getGpuModels().size(), 1); // Maybe First fit new FlowEdge(this.distributors[ResourceType.POWER.ordinal()], this.psu); this.computeResources.put( @@ -231,7 +231,7 @@ public class SimMachine { // Create a FlowDistributor and add the cpu as supplier this.distributors[ResourceType.CPU.ordinal()] = FlowDistributorFactory.getFlowDistributor( - engine, this.machineModel.getCpuDistributionStrategy(), maxTasks); + engine, this.machineModel.getCpuDistributionStrategy(), maxTasks, 1); new FlowEdge( this.distributors[ResourceType.CPU.ordinal()], (FlowSupplier) this.computeResources.get(ResourceType.CPU).getFirst(), @@ -244,7 +244,10 @@ public class SimMachine { if (this.availableResourceTypes.contains(ResourceType.GPU)) { this.distributors[ResourceType.GPU.ordinal()] = FlowDistributorFactory.getFlowDistributor( - engine, this.machineModel.getGpuDistributionStrategy(), maxTasks); + engine, + this.machineModel.getGpuDistributionStrategy(), + maxTasks, + this.machineModel.getGpuModels().size()); ArrayList<ComputeResource> gpus = new ArrayList<>(); for (GpuModel gpuModel : machineModel.getGpuModels()) { |