Perf.Measurements.Results: fix warmup/warmdown calculation

This index based calculation is inaccurate if the data structure doesn't reflect a single very specific usecase... instead we can simply calculate the timestamps by addition... Signed-off-by: Ondrej Lichtner <olichtne@redhat.com>
LNST-project · Oct 3, 2024 · 8e924a8 · 8e924a8
1 parent ef13708
commit 8e924a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 26 deletions.
diff --git a/lnst/RecipeCommon/Perf/Measurements/Results/FlowMeasurementResults.py b/lnst/RecipeCommon/Perf/Measurements/Results/FlowMeasurementResults.py
@@ -84,33 +84,11 @@ def end_timestamp(self):
 
     @property
     def warmup_end(self):
-        if self.warmup_duration == 0:
-            return self.start_timestamp
-
-        return max(
-            [
-                parallel[self.warmup_duration - 1].end_timestamp
-                for parallel in (
-                    *self.generator_results,
-                    *self.receiver_results,
-                )
-            ]
-        )
+        return self.start_timestamp+self.warmup_duration
 
     @property
     def warmdown_start(self):
-        if self.warmup_duration == 0:
-            return self.end_timestamp
-
-        return min(
-            [
-                parallel[-self.warmup_duration].start_timestamp
-                for parallel in (
-                    *self.generator_results,
-                    *self.receiver_results,
-                )
-            ]
-        )
+        return self.end_timestamp-self.warmup_duration
 
     def time_slice(self, start, end):
         result_copy = FlowMeasurementResults(

diff --git a/lnst/RecipeCommon/Perf/Measurements/Results/NeperFlowMeasurementResults.py b/lnst/RecipeCommon/Perf/Measurements/Results/NeperFlowMeasurementResults.py
@@ -12,7 +12,7 @@ def warmup_end(self):
 
         return max(
             [
-                parallel[self.warmup_duration - 1].end_timestamp
+                parallel.start_timestamp + self.warmup_duration
                 for parallel in self.generator_results
             ]
         )
@@ -27,7 +27,7 @@ def warmdown_start(self):
 
         return min(
             [
-                parallel[-self.warmup_duration].start_timestamp
+                parallel.start_timestamp - self.warmup_duration
                 for parallel in self.generator_results
             ]
         )