Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix iperf no connection and PerfResult warmup timestamp calculation #382

Merged
merged 3 commits into from
Oct 21, 2024
+12 −34
Merged

Fix iperf no connection and PerfResult warmup timestamp calculation #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1737da
IperfFlowMeasurement: fix iperf result structure for no connection
olichtne Oct 3, 2024
ef13708
Perf.Measurements: set minimal PerfInterval duration to 1
olichtne Oct 3, 2024
3cf4333
Perf.Measurements.Results: fix warmup/warmdown calculation
olichtne Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lnst/RecipeCommon/Perf/Measurements/IperfFlowMeasurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def _set_cpupin_params(self, params, cpupin):
def _parse_job_streams(self, job):
result = ParallelPerfResult()
if not job.passed:
result.append(PerfInterval(0, 0, "bits", time.time()))
result.append(SequentialPerfResult([PerfInterval(0, 1, "bits", time.time())]))
else:
for i in job.result["data"]["end"]["streams"]:
result.append(SequentialPerfResult())
Expand All @@ -225,7 +225,7 @@ def _parse_job_streams(self, job):

def _parse_job_cpu(self, job):
if not job.passed:
return PerfInterval(0, 0, "cpu_percent", time.time())
return PerfInterval(0, 1, "cpu_percent", time.time())
else:
cpu_percent = job.result["data"]["end"]["cpu_utilization_percent"]["host_total"]
job_start = job.result["data"]["start"]["timestamp"]["timesecs"]
Expand Down
4 changes: 2 additions & 2 deletions lnst/RecipeCommon/Perf/Measurements/NeperFlowMeasurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ def _parse_job_samples(self, job: Job) ->\
cpu_results = SequentialPerfResult()

if not job.passed:
results.append(PerfInterval(0, 0, "transactions", time.time()))
cpu_results.append(PerfInterval(0, 0, "cpu_percent", time.time()))
results.append(PerfInterval(0, 1, "transactions", time.time()))
cpu_results.append(PerfInterval(0, 1, "cpu_percent", time.time()))
olichtne marked this conversation as resolved.
Show resolved Hide resolved
elif job.what.is_crr_server():
# Neper doesn't support server stats for tcp_crr due to memory issues.
# Use perf_interval of 0.
Expand Down
26 changes: 2 additions & 24 deletions lnst/RecipeCommon/Perf/Measurements/Results/FlowMeasurementResults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
jtluka marked this conversation as resolved.
Show resolved Hide resolved

@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(
Expand Down
4 changes: 2 additions & 2 deletions lnst/RecipeCommon/Perf/Measurements/Results/NeperFlowMeasurementResults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
]
)
Expand All @@ -27,7 +27,7 @@ def warmdown_start(self):

return min(
[
parallel[-self.warmup_duration].start_timestamp
parallel.end_timestamp - self.warmup_duration
for parallel in self.generator_results
]
)
8 changes: 4 additions & 4 deletions lnst/RecipeCommon/Perf/Measurements/TRexFlowMeasurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ def _parse_results_by_port(self, job, port, flow):

if not job.passed:
timestamp = time.time()
results.generator_results.append(PerfInterval(0, 0, "packets", timestamp))
results.generator_cpu_stats.append(PerfInterval(0, 0, "cpu_percent", timestamp))
results.receiver_results.append(PerfInterval(0, 0, "packets", timestamp))
results.receiver_cpu_stats.append(PerfInterval(0, 0, "cpu_percent", timestamp))
results.generator_results.append(PerfInterval(0, 1, "packets", timestamp))
results.generator_cpu_stats.append(PerfInterval(0, 1, "cpu_percent", timestamp))
results.receiver_results.append(PerfInterval(0, 1, "packets", timestamp))
results.receiver_cpu_stats.append(PerfInterval(0, 1, "cpu_percent", timestamp))
else:
prev_time = job.result["start_time"]
prev_tx_val = 0
Expand Down
Loading