From 641e51cb4a9bb30e499562e5521901ea23631a8c Mon Sep 17 00:00:00 2001 From: Jonathan Wright Date: Tue, 18 Jul 2023 09:04:48 -0500 Subject: [PATCH] 1278-rebase Report number of reorder_seen --- src/iperf.h | 2 ++ src/iperf_api.c | 6 ++++-- src/iperf_api.h | 1 + src/tcp_info.c | 14 ++++++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/iperf.h b/src/iperf.h index c3ce333..60b4d6e 100644 --- a/src/iperf.h +++ b/src/iperf.h @@ -109,6 +109,7 @@ struct iperf_interval_results long rtt; long rttvar; long pmtu; + long reorder; }; struct iperf_stream_result @@ -120,6 +121,7 @@ struct iperf_stream_result iperf_size_t bytes_sent_omit; long stream_prev_total_retrans; long stream_retrans; + long stream_reorder; long stream_max_rtt; long stream_min_rtt; long stream_sum_rtt; diff --git a/src/iperf_api.c b/src/iperf_api.c index a95e024..30ff8d1 100644 --- a/src/iperf_api.c +++ b/src/iperf_api.c @@ -3308,6 +3308,8 @@ iperf_stats_callback(struct iperf_test *test) temp.rttvar = get_rttvar(&temp); temp.pmtu = get_pmtu(&temp); + temp.reorder = get_reorder(&temp); + rp->stream_reorder = temp.reorder; } } } else { @@ -3753,7 +3755,7 @@ iperf_print_results(struct iperf_test *test) if (test->sender_has_retransmits) { /* Sender summary, TCP and SCTP with retransmits. */ if (test->json_output) - cJSON_AddItemToObject(json_summary_stream, report_sender, iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f retransmits: %d max_snd_cwnd: %d max_snd_wnd: %d max_rtt: %d min_rtt: %d mean_rtt: %d sender: %b", (int64_t) sp->socket, (double) start_time, (double) sender_time, (double) sender_time, (int64_t) bytes_sent, bandwidth * 8, (int64_t) sp->result->stream_retrans, (int64_t) sp->result->stream_max_snd_cwnd, (int64_t) sp->result->stream_max_snd_wnd, (int64_t) sp->result->stream_max_rtt, (int64_t) sp->result->stream_min_rtt, (int64_t) ((sp->result->stream_count_rtt == 0) ? 0 : sp->result->stream_sum_rtt / sp->result->stream_count_rtt), stream_must_be_sender)); + cJSON_AddItemToObject(json_summary_stream, report_sender, iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f retransmits: %d reorder: %d max_snd_cwnd: %d max_snd_wnd: %d max_rtt: %d min_rtt: %d mean_rtt: %d sender: %b", (int64_t) sp->socket, (double) start_time, (double) sender_time, (double) sender_time, (int64_t) bytes_sent, bandwidth * 8, (int64_t) sp->result->stream_retrans, (int64_t) sp->result->stream_reorder, (int64_t) sp->result->stream_max_snd_cwnd, (int64_t) sp->result->stream_max_snd_wnd, (int64_t) sp->result->stream_max_rtt, (int64_t) sp->result->stream_min_rtt, (int64_t) ((sp->result->stream_count_rtt == 0) ? 0 : sp->result->stream_sum_rtt / sp->result->stream_count_rtt), stream_must_be_sender)); else if (test->role == 's' && !sp->sender) { if (test->verbose) @@ -4204,7 +4206,7 @@ print_interval_results(struct iperf_test *test, struct iperf_stream *sp, cJSON * if (test->sender_has_retransmits == 1 && sp->sender) { /* Interval, TCP with retransmits. */ if (test->json_output) - cJSON_AddItemToArray(json_interval_streams, iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f retransmits: %d snd_cwnd: %d snd_wnd: %d rtt: %d rttvar: %d pmtu: %d omitted: %b sender: %b", (int64_t) sp->socket, (double) st, (double) et, (double) irp->interval_duration, (int64_t) irp->bytes_transferred, bandwidth * 8, (int64_t) irp->interval_retrans, (int64_t) irp->snd_cwnd, (int64_t) irp->snd_wnd, (int64_t) irp->rtt, (int64_t) irp->rttvar, (int64_t) irp->pmtu, irp->omitted, sp->sender)); + cJSON_AddItemToArray(json_interval_streams, iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f retransmits: %d snd_cwnd: %d snd_wnd: %d rtt: %d rttvar: %d pmtu: %d reorder: %d omitted: %b sender: %b", (int64_t) sp->socket, (double) st, (double) et, (double) irp->interval_duration, (int64_t) irp->bytes_transferred, bandwidth * 8, (int64_t) irp->interval_retrans, (int64_t) irp->snd_cwnd, (int64_t) irp->snd_wnd, (int64_t) irp->rtt, (int64_t) irp->rttvar, (int64_t) irp->pmtu, (int64_t) irp->reorder, irp->omitted, sp->sender)); else { unit_snprintf(cbuf, UNIT_LEN, irp->snd_cwnd, 'A'); iperf_printf(test, report_bw_retrans_cwnd_format, sp->socket, mbuf, st, et, ubuf, nbuf, irp->interval_retrans, cbuf, irp->omitted?report_omitted:""); diff --git a/src/iperf_api.h b/src/iperf_api.h index 171006a..542d8c9 100644 --- a/src/iperf_api.h +++ b/src/iperf_api.h @@ -301,6 +301,7 @@ long get_snd_wnd(struct iperf_interval_results *irp); long get_rtt(struct iperf_interval_results *irp); long get_rttvar(struct iperf_interval_results *irp); long get_pmtu(struct iperf_interval_results *irp); +long get_reorder(struct iperf_interval_results *irp); void print_tcpinfo(struct iperf_test *test); void build_tcpinfo_message(struct iperf_interval_results *r, char *message); diff --git a/src/tcp_info.c b/src/tcp_info.c index 160063c..263e748 100644 --- a/src/tcp_info.c +++ b/src/tcp_info.c @@ -217,6 +217,20 @@ get_pmtu(struct iperf_interval_results *irp) #endif } +/*************************************************************/ +/* + * Return number of reordering events seen. + */ +long +get_reorder(struct iperf_interval_results *irp) +{ +#if defined(linux) && defined(TCP_REPAIR_ON) + return irp->tcpInfo.tcpi_reord_seen; +#else + return -1; +#endif +} + /*************************************************************/ void build_tcpinfo_message(struct iperf_interval_results *r, char *message) -- 2.41.0