From 39ad947995ef044ee7f4e5d62bccc13d52bfde80 Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Thu, 19 Dec 2013 14:44:15 -0800 Subject: [PATCH] For now, suppress printing congestion window stats in the output. (It remains in the JSON output.) We have some issues we need to resolve about the formatting and representation of this (and other future values that we might be adding). --- src/iperf_api.c | 4 ++-- src/locale.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/iperf_api.c b/src/iperf_api.c index 84b0277..2d6a52e 100644 --- a/src/iperf_api.c +++ b/src/iperf_api.c @@ -1905,7 +1905,7 @@ iperf_print_results(struct iperf_test *test) if (test->json_output) cJSON_AddItemToObject(json_summary_stream, "sender", iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f retransmits: %d", (int64_t) sp->socket, (double) start_time, (double) end_time, (double) end_time, (int64_t) bytes_sent, bandwidth * 8, (int64_t) sp->result->stream_retrans)); else - iprintf(test, report_bw_retrans_format, sp->socket, start_time, end_time, ubuf, nbuf, sp->result->stream_retrans, 0, report_sender); + iprintf(test, report_bw_retrans_format, sp->socket, start_time, end_time, ubuf, nbuf, sp->result->stream_retrans, report_sender); } else { /* Summary, TCP without retransmits. */ if (test->json_output) @@ -2067,7 +2067,7 @@ print_interval_results(struct iperf_test *test, struct iperf_stream *sp, cJSON * 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 omitted: %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, irp->omitted)); else - iprintf(test, report_bw_retrans_format, sp->socket, st, et, ubuf, nbuf, irp->interval_retrans, irp->snd_cwnd, irp->omitted?report_omitted:""); + iprintf(test, report_bw_retrans_format, sp->socket, st, et, ubuf, nbuf, irp->interval_retrans, irp->omitted?report_omitted:""); } else { /* Interval, TCP without retransmits. */ if (test->json_output) diff --git a/src/locale.c b/src/locale.c index 2f6c94d..c3bfa0b 100644 --- a/src/locale.c +++ b/src/locale.c @@ -229,7 +229,7 @@ const char report_bw_header[] = "[ ID] Interval Transfer Bandwidth\n"; const char report_bw_retrans_header[] = -"[ ID] Interval Transfer Bandwidth Retr CWND\n"; +"[ ID] Interval Transfer Bandwidth Retr\n"; const char report_bw_udp_header[] = "[ ID] Interval Transfer Bandwidth Jitter Lost/Total Datagrams\n"; @@ -241,7 +241,7 @@ const char report_bw_format[] = "[%3d] %6.2f-%-6.2f sec %ss %ss/sec %s\n"; const char report_bw_retrans_format[] = -"[%3d] %6.2f-%-6.2f sec %ss %ss/sec %3d %3d %s\n"; +"[%3d] %6.2f-%-6.2f sec %ss %ss/sec %3d %s\n"; const char report_bw_udp_format[] = "[%3d] %6.2f-%-6.2f sec %ss %ss/sec %5.3f ms %d/%d (%.2g%%) %s\n"; @@ -256,7 +256,7 @@ const char report_sum_bw_format[] = "[SUM] %6.2f-%-6.2f sec %ss %ss/sec %s\n"; const char report_sum_bw_retrans_format[] = -"[SUM] %6.2f-%-6.2f sec %ss %ss/sec %3d %s\n"; +"[SUM] %6.2f-%-6.2f sec %ss %ss/sec %s\n"; const char report_sum_bw_udp_format[] = "[SUM] %6.2f-%-6.2f sec %ss %ss/sec %5.3f ms %d/%d (%.2g%%) %s\n";