From e9080b6280a3a1264a35748eccd1c58205c001bf Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Mon, 17 Feb 2025 12:59:39 +0100 Subject: Fixed bugs (#304) --- .../simulator/compute/workload/trace/SimTraceWorkload.java | 4 ++++ .../org/opendc/simulator/engine/graph/FlowDistributor.java | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'opendc-simulator') diff --git a/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/workload/trace/SimTraceWorkload.java b/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/workload/trace/SimTraceWorkload.java index b6d939c9..46354d4c 100644 --- a/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/workload/trace/SimTraceWorkload.java +++ b/opendc-simulator/opendc-simulator-compute/src/main/java/org/opendc/simulator/compute/workload/trace/SimTraceWorkload.java @@ -124,6 +124,10 @@ public class SimTraceWorkload extends SimWorkload implements FlowConsumer { long remainingDuration = this.scalingPolicy.getRemainingDuration( this.cpuFreqDemand, this.newCpuFreqSupplied, this.remainingWork); + if (remainingDuration == 0.0) { + this.remainingWork = 0.0; + } + return now + remainingDuration; } diff --git a/opendc-simulator/opendc-simulator-flow/src/main/java/org/opendc/simulator/engine/graph/FlowDistributor.java b/opendc-simulator/opendc-simulator-flow/src/main/java/org/opendc/simulator/engine/graph/FlowDistributor.java index ff7ff199..dcbd79bb 100644 --- a/opendc-simulator/opendc-simulator-flow/src/main/java/org/opendc/simulator/engine/graph/FlowDistributor.java +++ b/opendc-simulator/opendc-simulator-flow/src/main/java/org/opendc/simulator/engine/graph/FlowDistributor.java @@ -39,8 +39,7 @@ public class FlowDistributor extends FlowNode implements FlowSupplier, FlowConsu private double currentIncomingSupply; // The current supply provided by the supplier private boolean outgoingDemandUpdateNeeded = false; - private final Set updatedDemands = - new HashSet<>(); // Array of consumers that updated their demand in this cycle + private Set updatedDemands = new HashSet<>(); // Array of consumers that updated their demand in this cycle private boolean overloaded = false; @@ -209,14 +208,18 @@ public class FlowDistributor extends FlowNode implements FlowSupplier, FlowConsu other.setConsumerIndex(other.getConsumerIndex() - 1); } - for (int idx_other : this.updatedDemands) { + HashSet newUpdatedDemands = new HashSet<>(); + for (int idx_other : this.updatedDemands) { if (idx_other > idx) { - this.updatedDemands.remove(idx_other); - this.updatedDemands.add(idx_other - 1); + newUpdatedDemands.add(idx_other - 1); + } else { + newUpdatedDemands.add(idx_other); } } + this.updatedDemands = newUpdatedDemands; + this.outgoingDemandUpdateNeeded = true; this.invalidate(); } -- cgit v1.2.3