From a1445927b999e46dfcbdc8956d529f074cad114f Mon Sep 17 00:00:00 2001 From: Jonathan Shook Date: Wed, 1 Nov 2023 11:24:45 -0500 Subject: [PATCH] minor fix for sampling window test stability --- .../scenarios/simframe/capture/FrameSample.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/capture/FrameSample.java b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/capture/FrameSample.java index d2bc2af81..cf8460db4 100644 --- a/nbr/src/main/java/io/nosqlbench/scenarios/simframe/capture/FrameSample.java +++ b/nbr/src/main/java/io/nosqlbench/scenarios/simframe/capture/FrameSample.java @@ -58,7 +58,7 @@ public final class FrameSample { if (active) { this.endAt = endTime; this.endval = (criterion().evaltype() != EvalType.remix) ? criterion().supplier().getAsDouble() : Double.NaN; - calculateBasis(); + calculateBasis(endTime); this.active = false; } else { throw new RuntimeException("Can't stop an inactive frame."); @@ -67,10 +67,14 @@ public final class FrameSample { } private void calculateBasis() { + calculateBasis(System.currentTimeMillis()); + } + + private void calculateBasis(long now) { if (!active) { throw new RuntimeException("Calculations on inactive windows should not be done."); } - this.endAt = System.currentTimeMillis(); + this.endAt = now; this.endval = (criterion().evaltype() != EvalType.remix) ? criterion().supplier().getAsDouble() : Double.NaN; double seconds = deltaT(); double basis = switch (criterion.evaltype()) {