Skip to content

Commit 69d5909

Browse files
committed
feat: add pps summary for udp
1 parent 8cf9df4 commit 69d5909

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/iperf_api.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3876,7 +3876,7 @@ iperf_print_intermediate(struct iperf_test *test)
38763876
if (test->json_output)
38773877
cJSON_AddItemToObject(json_interval, sum_name, iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f jitter_ms: %f lost_packets: %d packets: %d lost_percent: %f omitted: %b sender: %b", (double) start_time, (double) end_time, (double) irp->interval_duration, (int64_t) bytes, bandwidth * 8, (double) avg_jitter * 1000.0, (int64_t) lost_packets, (int64_t) total_packets, (double) lost_percent, test->omitting, stream_must_be_sender));
38783878
else
3879-
iperf_printf(test, report_sum_bw_udp_format, mbuf, start_time, end_time, ubuf, nbuf, avg_jitter * 1000.0, lost_packets, total_packets, lost_percent, test->omitting?report_omitted:"");
3879+
iperf_printf(test, report_sum_bw_udp_format, mbuf, start_time, end_time, ubuf, nbuf, avg_jitter * 1000.0, lost_packets, total_packets, lost_percent, (int)((total_packets - lost_packets) / (end_time - start_time)), test->omitting?report_omitted:"");
38803880
}
38813881
}
38823882
}
@@ -4340,7 +4340,7 @@ iperf_print_results(struct iperf_test *test)
43404340
*/
43414341
if (! (test->role == 's' && !stream_must_be_sender) ) {
43424342
unit_snprintf(ubuf, UNIT_LEN, (double) total_sent, 'A');
4343-
iperf_printf(test, report_sum_bw_udp_format, mbuf, start_time, sender_time, ubuf, nbuf, 0.0, (int64_t) 0, sender_total_packets, 0.0, report_sender);
4343+
iperf_printf(test, report_sum_bw_udp_format, mbuf, start_time, sender_time, ubuf, nbuf, 0.0, (int64_t) 0, sender_total_packets, 0.0, (int)(sender_total_packets / (sender_time - start_time)), report_sender);
43444344
}
43454345
if (! (test->role == 's' && stream_must_be_sender) ) {
43464346

@@ -4353,7 +4353,7 @@ iperf_print_results(struct iperf_test *test)
43534353
bandwidth = 0.0;
43544354
}
43554355
unit_snprintf(nbuf, UNIT_LEN, bandwidth, test->settings->unit_format);
4356-
iperf_printf(test, report_sum_bw_udp_format, mbuf, start_time, receiver_time, ubuf, nbuf, avg_jitter * 1000.0, lost_packets, receiver_total_packets, lost_percent, report_receiver);
4356+
iperf_printf(test, report_sum_bw_udp_format, mbuf, start_time, receiver_time, ubuf, nbuf, avg_jitter * 1000.0, lost_packets, receiver_total_packets, lost_percent, (int)((receiver_total_packets - lost_packets) / (receiver_time - start_time)), report_receiver);
43574357
}
43584358
}
43594359
}

src/iperf_locale.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ const char report_sum_bw_retrans_format[] =
418418
"[SUM]%s %6.2f-%-6.2f sec %ss %ss/sec %3"PRId64" %s\n";
419419

420420
const char report_sum_bw_udp_format[] =
421-
"[SUM]%s %6.2f-%-6.2f sec %ss %ss/sec %5.3f ms %" PRId64 "/%" PRId64 " (%.2g%%) %s\n";
421+
"[SUM]%s %6.2f-%-6.2f sec %ss %ss/sec %5.3f ms %" PRId64 "/%" PRId64 " (%.2g%%) %" PRId64 " pps %s\n";
422422

423423
const char report_sum_bw_udp_sender_format[] =
424424
"[SUM]%s %6.2f-%-6.2f sec %ss %ss/sec %s %" PRId64 " %s\n";

0 commit comments

Comments
 (0)