diff options
Diffstat (limited to '')
| -rw-r--r-- | src/Locale.c | 328 |
1 files changed, 230 insertions, 98 deletions
diff --git a/src/Locale.c b/src/Locale.c index 09333b0..34c82dd 100644 --- a/src/Locale.c +++ b/src/Locale.c @@ -50,8 +50,25 @@ * ------------------------------------------------------------------- * Strings and other stuff that is locale specific. * ------------------------------------------------------------------- */ + +/* Format specifiers per inttypes.h + * + * macro description example + * PRIxMAX printf specifier for intmax_t PRIiMAX is the equivalent of i (in "%i") for intmax_t values + * PRIxN printf specifier for intN_t PRId16 is the equivalent of d (in "%d") for int16_t values + * PRIxLEASTN printf specifier for int_leastN_t PRIuLEAST32 is the equivalent of u (in "%u") for uint32_t values + * PRIxFASTN printf specifier for int_fastN_t PRIxFAST8 is the equivalent of x (in "%x") for uint8_t values + * PRIxPTR printf specifier for intptr_t PRIuPTR is the equivalent of u (in "%u") for uintptr_t values + * + Where: + * x is one of d, i, o,u or x (for the printf specifiers this can also be an uppercase X).* + * N is 8, 16, 32, 64, or any other type width supported by the library in <cstdint>. + * * The specifier assumes the type to be signed for i and d, and unsigned for o, u, x and X. + */ + #include "headers.h" #include "version.h" +#include "gettcpinfo.h" #ifdef __cplusplus extern "C" { @@ -73,12 +90,14 @@ Client/Server:\n\ -e, --enhanced use enhanced reporting giving more tcp/udp and traffic information\n\ -f, --format [kmgKMG] format to report: Kbits, Mbits, KBytes, MBytes\n\ --hide-ips hide ip addresses and host names within outputs\n\ + --histograms enable histograms (see client or server for more)\n\ -i, --interval # seconds between periodic bandwidth reports\n\ -l, --len #[kmKM] length of buffer in bytes to read or write (Defaults: TCP=128K, v4 UDP=1470, v6 UDP=1450)\n\ -m, --print_mss print TCP maximum segment size\n\ -o, --output <filename> output the report or error message to this specified file\n\ -p, --port # client/server port to listen/send on and to connect\n\ --permit-key permit key to be used to verify client and server (TCP only)\n\ + --tcp-tx-delay set transmit delay\n\ --sum-only output sum only reports\n\ -u, --udp use UDP rather than TCP\n\ --utc use coordinated universal time (UTC) with time output\n\ @@ -102,6 +121,7 @@ Server specific:\n\ --jitter-histograms enable jitter histograms\n\ --permit-key-timeout set the timeout for a permit key in seconds\n\ --tcp-rx-window-clamp set the TCP receive window clamp size in bytes\n\ + --test-exchange-timeout set the timeout on the test exchange, use 0 for no timeout\n\ --tap-dev #[<dev>] use TAP device to receive at L2 layer\n\ -t, --time # time in seconds to listen for new connections as well as to receive traffic (default not set)\n\ -B, --bind <ip>[%<dev>] bind to multicast address and optional device\n\ @@ -119,25 +139,34 @@ const char usage_long2[] = "\ Client specific:\n\ --bounceback request a bounceback test (use -l for size, defaults to 100 bytes)\n\ --bounceback-hold request the server to insert a delay of n milliseconds between its read and write\n\ - --bounceback-period request the client schedule a send every n milliseconds\n\ --bounceback-no-quickack request the server not set the TCP_QUICKACK socket option (disabling TCP ACK delays) during a bounceback test\n\ + --bounceback-period request the client schedule a send every n milliseconds\n \ + --bounceback-reply set the bounceback reply message size (defaults to symmetric)\n \ + --bounceback-txdelay request the bounceback server delay n seconds between the request and the reply\n \ -c, --client <host> run in client mode, connecting to <host>\n\ --connect-only run a connect only test\n\ - --connect-retries # number of times to retry tcp connect\n\ + --connect-retry-timer minimum time interval in seconds between application level connect retries\n\ + --connect-retry-time time interval in seconds to attempt application level connect retries \n\ + --dscp set the DSCP field (masking ECN bits) in TOS byte\n\ -d, --dualtest Do a bidirectional test simultaneously (multiple sockets)\n\ --fq-rate #[kmgKMG] bandwidth to socket pacing\n\ + --fq-rate-step #[kmgKMG] step value to socket pacing\n\ + --fq-rate-step-interval #[kmgKMG] step interval (in seconds) for socket pacing\n\ --full-duplex run full duplex test using same socket\n\ - --ipg set the the interpacket gap (milliseconds) for packets within an isochronous frame\n\ - --isochronous <frames-per-second>:<mean>,<stddev> send traffic in bursts (frames - emulate video traffic)\n\ + --histograms enable histograms for --tcp-write-times\n\ + --ignore-shutdown don't wait on the TCP shutdown or close (fin & finack) rather use the final write as the ending event\n\ --incr-dstip Increment the destination ip with parallel (-P) traffic threads\n\ --incr-dstport Increment the destination port with parallel (-P) traffic threads\n\ --incr-srcip Increment the source ip with parallel (-P) traffic threads\n\ --incr-srcport Increment the source port with parallel (-P) traffic threads\n\ + --ipg set the the interpacket gap (milliseconds) for packets within an isochronous frame\n\ + --isochronous <frames-per-second>:<mean>,<stddev> send traffic in bursts (frames - emulate video traffic)\n\ --local-only Set don't route on socket\n\ --near-congestion=[w] Use a weighted write delay per the sampled TCP RTT (experimental)\n\ --no-connect-sync No sychronization after connect when -P or parallel traffic threads\n\ --no-udp-fin No final server to client stats at end of UDP test\n\ -n, --num #[kmgKMG] number of bytes to transmit (instead of -t)\n\ + --sync-transfer-id pass the clients' transfer id(s) to the server so both will use the same id in their respective outputs\n\ -r, --tradeoff Do a fullduplexectional test individually\n\ --tcp-quickack set the socket's TCP_QUICKACK option (off by default)\n\ --tcp-write-prefetch set the socket's TCP_NOTSENT_LOWAT value in bytes and use event based writes\n\ @@ -160,7 +189,8 @@ Client specific:\n\ #endif " -S, --tos IP DSCP or tos settings\n\ -T, --ttl # time-to-live, for multicast (default 1)\n\ - --working-load request a concurrent TCP stream\n\ + --working-load request working load(s)\n\ + --working-load-cca set working load CCA\n\ -V, --ipv6_domain Set the domain to IPv6 (send packets over IPv6)\n\ -X, --peer-detect perform server version detection and version exchange\n\ \n\ @@ -196,6 +226,8 @@ Report bugs to <iperf-users@lists.sourceforge.net>\n"; const char version[] = "iperf version " IPERF_VERSION " (" IPERF_VERSION_DATE ") " IPERF_THREADS "\n"; +const char branch_version[] = +"iperf (branch " IPERF_BRANCH ") (" IPERF_VERSION_DATE ") " IPERF_THREADS "\n"; /* ------------------------------------------------------------------- * settings @@ -213,14 +245,17 @@ const char client_port[] = const char server_pid_port[] = "Server listening on %s port %d with pid %d\n"; +const char server_working_load_port[] = +"Working load listening on %s port %d\n"; + const char server_pid_portrange[] = "Server listening on %s ports %d-%d with pid %d\n"; const char client_pid_port[] = -"Client connecting to %s, %s port %d with pid %d (%d flows)\n"; +"Client connecting to %s, %s port %d with pid %d (%d/%d flows/load)\n"; const char client_pid_port_dev[] = -"Client connecting to %s, %s port %d with pid %d via %s (%d flows)\n"; +"Client connecting to %s, %s port %d with pid %d via %s (%d/%d flows/load)\n"; const char bind_address[] = "Binding to local address %s\n"; @@ -277,10 +312,13 @@ const char client_burstperiodcount[] = "Bursting: %s writes %d times every %0.2f second(s)\n"; const char client_bounceback[] = -"Bounce-back test (size=%s) (server hold req=%d usecs & tcp_quickack)\n"; +"Bounceback test (req/reply size =%s/%s) (server hold req=%d usecs & tcp_quickack)\n"; + +const char client_bbburstperiodcount[] = +"Bursting request %d times every %0.2f second(s)\n"; const char client_bounceback_noqack[] = -"Bounce-back test (size=%s) (server hold req=%d usecs)\n"; +"Bounceback test (req/reply size =%s/%s) (server hold req=%d usecs)\n"; const char server_burstperiod[] = "Burst wait timeout set to (2 * %0.2f) seconds (use --burst-period=<n secs> to change)\n"; @@ -288,6 +326,9 @@ const char server_burstperiod[] = const char client_fq_pacing [] = "fair-queue socket pacing set to %s/s\n"; +const char client_fq_pacing_step [] = +"fair-queue socket pacing set to %s/s (stepping rate by %s/s)\n"; + /* ------------------------------------------------------------------- * Legacy reports * ------------------------------------------------------------------- */ @@ -296,28 +337,28 @@ const char report_bw_header[] = "[ ID] Interval Transfer Bandwidth\n"; const char report_bw_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec%s\n"; const char report_sum_bw_format[] = -"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec\n"; +"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec%s\n"; const char report_sumcnt_bw_format[] = -"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec\n"; +"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec%s\n"; const char report_bw_jitter_loss_header[] = "[ ID] Interval Transfer Bandwidth Jitter Lost/Total Datagrams\n"; const char report_bw_jitter_loss_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%)\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%)%s\n"; const char report_sum_bw_jitter_loss_format[] = -"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " (%.2g%%)\n"; +"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " (%.2g%%)%s\n"; const char report_sumcnt_bw_jitter_loss_header[] = "[SUM-cnt] Interval Transfer Bandwidth Lost/Total PPS\n"; const char report_sumcnt_bw_jitter_loss_format[] = -"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %8.0f pps\n"; +"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %8.0f pps%s\n"; /* ------------------------------------------------------------------- * Enhanced reports (per -e) @@ -335,172 +376,250 @@ const char server_read_size[] = "Read buffer size"; const char report_bw_enhanced_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec%s\n"; const char report_sum_bw_enhanced_format[] = -"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec\n"; +"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec%s\n"; const char report_bw_read_enhanced_header[] = "[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Reads=Dist\n"; const char report_bw_read_enhanced_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d%s\n"; const char report_sumcnt_bw_read_enhanced_header[] = "[SUM-cnt] Interval" IPERFTimeSpace "Transfer Bandwidth Reads=Dist\n"; const char report_sumcnt_bw_read_enhanced_format[] = -"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d\n"; +"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d%s\n"; const char report_sumcnt_bw_read_triptime_header[] = "[SUM-cnt] Interval" IPERFTimeSpace "Transfer Bandwidth InP Reads=Dist\n"; const char report_sumcnt_bw_read_triptime_format[] = -"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %s %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d\n"; +"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %s %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d%s\n"; const char report_bw_read_enhanced_netpwr_header[] = "[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Burst Latency avg/min/max/stdev (cnt/size) inP NetPwr Reads=Dist\n"; const char report_bw_read_enhanced_netpwr_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %.3f/%.3f/%.3f/%.3f ms (%d/%d) %s %s %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %.3f/%.3f/%.3f/%.3f ms (%d/%d) %s %s %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d%s\n"; const char report_bw_isoch_enhanced_netpwr_header[] = "[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Burst Latency avg/min/max/stdev (cnt/size) NetPwr Reads=Dist\n"; const char report_bw_isoch_enhanced_netpwr_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %.3f/%.3f/%.3f/%.3f ms (%d/%d) %s %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %.3f/%.3f/%.3f/%.3f ms (%d/%d) %s %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d%s\n"; const char report_sum_bw_read_enhanced_format[] = -"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d\n"; +"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d%s\n"; const char report_triptime_enhanced_format[] = -"%s" IPERFTimeFrmt " trip-time (3WHS done->fin+finack) = %.4f sec\n"; +"%s" IPERFTimeFrmt " trip-time (3WHS done->fin+finack) = %.4f sec%s\n"; #if HAVE_TCP_STATS +#if HAVE_TCP_INFLIGHT +const char report_bw_write_enhanced_header[] = +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err Rtry InF(pkts)/Cwnd(pkts)/RTT(var) NetPwr\n"; + +const char report_bw_write_enhanced_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%10" PRIdMAX " %8" PRIdMAX "K(%" PRIuLEAST32 ")/%" PRIdMAX "K(%" PRIuLEAST32 ")/%" PRIuLEAST32 "(%" PRIuLEAST32 ") us %s\n"; + +const char report_write_enhanced_nocwnd_write_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %10" PRIdMAX " NA/%" PRIuLEAST32 "(%" PRIuLEAST32 ") us %s %.3f/%.3f/%.3f/%.3f ms (%" PRIdMAX ")%s\n"; + +const char report_bw_write_enhanced_fq_header[] = +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err Rtry InF(pkts)/Cwnd(pkts)/RTT(var) fq-rate NetPwr\n"; + +const char report_bw_write_enhanced_fq_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%10" PRIdMAX " %8" PRIdMAX "K(%" PRIuLEAST32 ")/%" PRIdMAX "K(%" PRIuLEAST32 ")/%" PRIuLEAST32 "(%" PRIuLEAST32 ") us %s/sec %s%s\n"; + const char report_client_bb_bw_header[] = -"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth BB cnt=avg/min/max/stdev Rtry Cwnd/RTT RPS\n"; +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth BB cnt=avg/min/max/stdev Rtry Cwnd(pkts)/RTT(var) RPS(avg)\n"; const char report_client_bb_bw_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%.3f/%.3f/%.3f/%.3f ms %4d %4dK/%u us %s rps\n"; -#else +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%.3f/%.3f/%.3f/%.3f ms %4" PRIuLEAST32 "%4" PRIdMAX "K/(%" PRIuLEAST32 ")/%" PRIuLEAST32 "(%" PRIuLEAST32 ") us %s rps%s\n"; + +const char report_client_bb_bw_final_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%.3f/%.3f/%.3f/%.3f ms %4" PRIuLEAST32 " -(-)/-(-) %s rps%s\n"; + +const char report_write_enhanced_write_header[] = +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err Rtry InF(pkts)/Cwnd(pkts)/RTT(var) NetPwr write-times avg/min/max/stdev (cnt)\n"; + +const char report_write_enhanced_write_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %8" PRIuLEAST32 "%7" PRIdMAX "K(%" PRIuLEAST32 ")/%" PRIdMAX "K(%" PRIuLEAST32 ")/%" PRIuLEAST32 "(%" PRIuLEAST32 ") us %s %.3f/%.3f/%.3f/%.3f ms (%" PRIdMAX ")%s\n"; + +#else // no inflight +const char report_bw_write_enhanced_header[] = +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err Rtry Cwnd(pkts)/RTT(var) NetPwr\n"; + +const char report_bw_write_enhanced_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%10" PRIuLEAST32 " %8" PRIdMAX "K(%" PRIuLEAST32 ")/%" PRIuLEAST32 "(%" PRIuLEAST32 ") us %s\n"; + +const char report_bw_write_enhanced_fq_header[] = +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err Rtry Cwnd(pkts)/RTT(var) fq-rate NetPwr\n"; + +const char report_bw_write_enhanced_fq_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%10" PRIuLEAST32 " %8" PRIdMAX "K(%" PRIuLEAST32 ")/%" PRIuLEAST32 "(%" PRIuLEAST32 ") us %s/sec %s%s\n"; + const char report_client_bb_bw_header[] = -"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth BB cnt=avg/min/max/stdev RPS\n"; +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth BB cnt=avg/min/max/stdev Rtry Cwnd(pkts)/RTT(var) RPS(avg)\n"; const char report_client_bb_bw_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%.3f/%.3f/%.3f/%.3f ms %s rps\n"; -#endif -const char report_client_bb_bw_triptime_format[] = -"%s" IPERFTimeFrmt " sec OWD Delays (ms) Cnt=%" PRIdMAX " To=%.3f/%.3f/%.3f/%.3f From=%.3f/%.3f/%.3f/%.3f Asymmetry=%.3f/%.3f/%.3f/%.3f %s rps\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%.3f/%.3f/%.3f/%.3f ms %4" PRIuLEAST32 " %4" PRIdMAX "K(%" PRIuLEAST32 ")/%" PRIuLEAST32 "(%" PRIuLEAST32 ") us %s rps%s\n"; + +const char report_client_bb_bw_final_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%.3f/%.3f/%.3f/%.3f ms %4" PRIuLEAST32 " -(-)/-(-) %s rps%s\n"; const char report_write_enhanced_write_header[] = -"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err Rtry Cwnd/RTT NetPwr write-times avg/min/max/stdev (cnt)\n"; +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err Rtry Cwnd(pkts)/RTT(var) NetPwr write-times avg/min/max/stdev (cnt)\n"; const char report_write_enhanced_write_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %10" PRIdMAX "%8dK/%u us %s %.3f/%.3f/%.3f/%.3f ms (%" PRIdMAX ")\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %10" PRIuLEAST32 "%8" PRIdMAX "K(%" PRIuLEAST32 ")/%" PRIuLEAST32 "(%" PRIuLEAST32 ") us %s %.3f/%.3f/%.3f/%.3f ms (%" PRIdMAX ")%s\n"; const char report_write_enhanced_nocwnd_write_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %10" PRIdMAX " NA/%u us %s %.3f/%.3f/%.3f/%.3f ms (%" PRIdMAX ")\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %10" PRIuLEAST32 " NA/%" PRIuLEAST32 "(%" PRIuLEAST32 ") us %s %.3f/%.3f/%.3f/%.3f ms (%" PRIdMAX ")%s\n"; - -#if HAVE_TCP_STATS -const char report_bw_write_enhanced_header[] = -"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err Rtry Cwnd/RTT(var) NetPwr\n"; +#endif //HAVE_TCP_INFLIGHT const char report_sum_bw_write_enhanced_format[] = -"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%10" PRIdMAX "\n"; +"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%10" PRIuLEAST32 " %s\n"; -const char report_bw_write_enhanced_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%10" PRIdMAX " %8dK/%u(%u) us %s\n"; +const char report_bw_write_enhanced_fq_final_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%10" PRIuLEAST32 " %8dK/%u(%u) us %s%s\n"; const char report_bw_write_enhanced_nocwnd_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %10" PRIdMAX " NA/%u us %s\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %10" PRIuLEAST32 " NA/%" PRIuLEAST32 "(%" PRIuLEAST32 ")us %s\n"; const char report_write_enhanced_isoch_header[] = -"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err Rtry Cwnd/RTT isoch:tx/miss/slip NetPwr\n"; +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err Rtry Cwnd(pkts)/RTT(var) isoch:tx/miss/slip NetPwr\n"; const char report_write_enhanced_isoch_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %8d %8dK/%u us %9" PRIuMAX "/%" PRIuMAX "/%" PRIuMAX " %s\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %8" PRIuLEAST32 " %8" PRIdMAX "K(%" PRIuLEAST32 ")/%" PRIuLEAST32 "(%" PRIuLEAST32 ") us %9" PRIuMAX "/%" PRIuMAX "/%" PRIuMAX " %s%s\n"; const char report_write_enhanced_isoch_nocwnd_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %10" PRIdMAX " NA/%u us %9" PRIuMAX "/%" PRIuMAX "/%" PRIuMAX " %s\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %10" PRIuLEAST32 " NA/%" PRIuLEAST32 "(%" PRIuLEAST32 ") us %9" PRIuMAX "/%" PRIuMAX "/%" PRIuMAX " %s%s\n"; -#else +#else //no tcpstat + +const char report_client_bb_bw_header[] = +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth BB cnt=avg/min/max/stdev RPS(avg)\n"; + +const char report_client_bb_bw_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%.3f/%.3f/%.3f/%.3f ms %s rps%s\n"; + +const char report_bw_write_enhanced_fq_header[] = +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err fq-rate NetPwr\n"; + +const char report_bw_write_enhanced_fq_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%s/sec %s%s\n"; const char report_bw_write_enhanced_header[] = "[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err\n"; const char report_bw_write_enhanced_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%s\n"; const char report_sum_bw_write_enhanced_format[] = -"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "\n"; +"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%s\n"; const char report_write_enhanced_isoch_header[] = "[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err isoch:tx/miss/slip\n"; const char report_write_enhanced_isoch_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%9" PRIuMAX "/%" PRIuMAX "/%" PRIuMAX "\n"; -#endif +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%9" PRIuMAX "/%" PRIuMAX "/%" PRIuMAX "%s\n"; + +const char report_write_enhanced_write_header[] = +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err NetPwr write-times avg/min/max/stdev (cnt)\n"; + +const char report_write_enhanced_write_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%s %.3f/%.3f/%.3f/%.3f ms (%" PRIdMAX ")%s\n"; + +const char report_bw_write_fq_header[] = +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err fq-rate\n"; + +const char report_bw_write_fq_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %s/sec%s\n"; + +#endif //no tcp stat + +const char report_client_bb_bw_triptime_format[] = +"%s" IPERFTimeFrmt " sec OWD (ms) Cnt=%" PRIdMAX " TX=%.3f/%.3f/%.3f/%.3f RX=%.3f/%.3f/%.3f/%.3f Asymmetry=%.3f/%.3f/%.3f/%.3f%s\n"; const char report_sumcnt_bw_write_enhanced_header[] = "[SUM-cnt] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err Rtry\n"; const char report_sumcnt_bw_write_enhanced_format[] = -"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%10" PRIdMAX "\n"; +"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%10" PRIdMAX "%s\n"; const char report_bw_pps_enhanced_header[] = -"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err PPS\n"; +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err/Timeo PPS\n"; const char report_bw_pps_enhanced_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %8.0f pps\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "/%" PRIdMAX "%8.0f pps%s\n"; const char report_sumcnt_bw_pps_enhanced_header[] = "[SUM-cnt] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err PPS\n"; const char report_sumcnt_bw_pps_enhanced_format[] = -"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %8.0f pps\n"; +"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %8.0f pps%s\n"; const char report_sumcnt_udp_enhanced_header[] = "[SUM-cnt] Interval" IPERFTimeSpace "Transfer Bandwidth Lost/Total PPS\n"; const char report_sumcnt_udp_enhanced_format[] = -"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %8.0f pps\n"; +"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %8.0f pps%s\n"; const char report_sumcnt_udp_triptime_header[] = "[SUM-cnt] Interval" IPERFTimeSpace "Transfer Bandwidth Lost/Total Rx/inP PPS\n"; const char report_sumcnt_udp_triptime_format[] = -"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %" PRIdMAX "/%.0f %8.0f pps\n"; +"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX " %" PRIdMAX "/%.0f %8.0f pps%s\n"; const char report_bw_pps_enhanced_isoch_header[] = "[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Write/Err PPS isoch:tx/miss/slip\n"; const char report_bw_pps_enhanced_isoch_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%8.0f pps %3" PRIuMAX "/%" PRIuMAX "/%" PRIuMAX "\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%8.0f pps %3" PRIuMAX "/%" PRIuMAX "/%" PRIuMAX "%s\n"; const char report_sum_bw_pps_enhanced_format[] = -"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%8.0f pps\n"; +"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "/%" PRIdMAX "%8.0f pps%s\n"; const char report_bw_jitter_loss_pps_header[] = "[ ID] Interval Transfer Bandwidth Jitter Lost/Total Datagrams PPS\n"; const char report_bw_jitter_loss_pps_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %8.0f pps\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %8.0f pps%s\n"; +#if HAVE_DECL_MSG_TRUNC const char report_bw_jitter_loss_enhanced_header[] = "[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Jitter Lost/Total \ - Latency avg/min/max/stdev PPS NetPwr\n"; + Latency avg/min/max/stdev PPS Read/Timeo/Trunc NetPwr\n"; const char report_bw_jitter_loss_enhanced_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.3f/%.3f/%.3f/%.3f ms %.0f pps %s\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.3f/%.3f/%.3f/%.3f ms %.0f pps %" PRIdMAX "/%" PRIdMAX "/%" PRIdMAX " %s%s\n"; const char report_bw_jitter_loss_enhanced_triptime_header[] = "[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Jitter Lost/Total \ - Latency avg/min/max/stdev PPS Rx/inP NetPwr\n"; + Latency avg/min/max/stdev PPS Rx/inP Read/Timeo/Trunc NetPwr\n"; const char report_bw_jitter_loss_enhanced_triptime_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.3f/%.3f/%.3f/%.3f ms %.0f pps %" PRIdMAX "/%s %s\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.3f/%.3f/%.3f/%.3f ms %.0f pps %" PRIdMAX "/%s %" PRIdMAX "/%" PRIdMAX "/%" PRIdMAX " %s%s\n"; +#else +const char report_bw_jitter_loss_enhanced_header[] = +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Jitter Lost/Total \ + Latency avg/min/max/stdev PPS Read/Timeo NetPwr\n"; + +const char report_bw_jitter_loss_enhanced_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.3f/%.3f/%.3f/%.3f ms %.0f pps %" PRIdMAX "/%" PRIdMAX " %s%s\n"; +const char report_bw_jitter_loss_enhanced_triptime_header[] = +"[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Jitter Lost/Total \ + Latency avg/min/max/stdev PPS Rx/inP Read/Timeo NetPwr\n"; + +const char report_bw_jitter_loss_enhanced_triptime_format[] = +"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.3f/%.3f/%.3f/%.3f ms %.0f pps %" PRIdMAX "/%s %" PRIdMAX "/%" PRIdMAX "%s%s\n"; +#endif //msgtrunc const char report_bw_jitter_loss_enhanced_isoch_header[] = "[ ID] Interval" IPERFTimeSpace "Transfer Bandwidth Jitter Lost/Total \ Latency avg/min/max/stdev PPS NetPwr Isoch:rx/lost\n"; @@ -510,16 +629,16 @@ const char report_bw_jitter_loss_enhanced_isoch_triptime_header[] = Latency avg/min/max/stdev PPS Frame:rx/lost Frame-latency avg/min/max/stdev NetPwr\n"; const char report_bw_jitter_loss_enhanced_isoch_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.3f/%.3f/%.3f/%.3f ms %.0f pps %3d/%d %.3f/%.3f/%.3f/%.3f ms %s\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.3f/%.3f/%.3f/%.3f ms %.0f pps %3" PRIdMAX " /% " PRIdMAX " %.3f/%.3f/%.3f/%.3f ms %s%s\n"; const char report_sum_bw_jitter_loss_enhanced_format[] = -"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.0f pps\n"; +"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.0f pps%s\n"; const char report_sumcnt_bw_jitter_loss_enhanced_format[] = -"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.0f pps\n"; +"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.0f pps%s\n"; const char report_bw_jitter_loss_suppress_enhanced_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) -/-/-/- ms %.0f pps\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) -/-/-/- ms %.0f pps %" PRIdMAX "/%" PRIdMAX "/%" PRIdMAX "%s\n"; /* * Frame interval reports @@ -531,10 +650,10 @@ const char report_frame_jitter_loss_enhanced_header[] = Latency avg/min/max/stdev PPS inP NetPwr\n"; const char report_frame_jitter_loss_enhanced_format[] = -"%s" IPERFFTimeFrmt "(%0.4f) sec %ss %ss/sec %" PRIdMAX " %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.3f/%.3f/%.3f/%.3f ms %.0f pps %2.0f pkts %s\n"; +"%s" IPERFFTimeFrmt "(%0.4f) sec %ss %ss/sec %" PRIdMAX " %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) %.3f/%.3f/%.3f/%.3f ms %.0f pps %2.0f pkts %s%s\n"; const char report_frame_jitter_loss_suppress_enhanced_format[] = -"%s" IPERFTimeFrmt "(%0.4f) sec %" PRIdMAX " %ss %ss/sec %" PRIdMAX " %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) -/-/-/- ms %.0f pps\n"; +"%s" IPERFTimeFrmt "(%0.4f) sec %" PRIdMAX " %ss %ss/sec %" PRIdMAX " %6.3f ms %" PRIdMAX "/%" PRIdMAX " (%.2g%%) -/-/-/- ms %.0f pps %s%s\n"; const char report_frame_tcp_enhanced_header[] = "[ ID] Interval(f-transit)" IPERFFTimeSpace "Transfer Bandwidth FrameID\n"; @@ -543,7 +662,7 @@ const char report_burst_read_tcp_header[] = "[ ID] Burst (start-end)" IPERFFTimeSpace "Transfer Bandwidth XferTime (DC%) Reads=Dist NetPwr\n"; const char report_burst_read_tcp_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms (%.2g%%) %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d %s\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms (%.2g%%) %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d %s%s\n"; const char report_burst_read_tcp_final_format[] = "%s" IPERFTimeFrmt " sec %ss %ss/sec %.3f/%.3f/%.3f/%.3f ms %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d\n"; @@ -552,63 +671,57 @@ const char report_burst_write_tcp_header[] = "[ ID] Burst (start-end)" IPERFFTimeSpace "Transfer Bandwidth XferTime Write/Err Rtry Cwnd/RTT NetPwr\n"; const char report_burst_write_tcp_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX "%10" PRIdMAX "%8dK/%u %s\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX "%10" PRIdMAX "%8dK/%u %s%s\n"; #else const char report_burst_write_tcp_header[] = "[ ID] Burst (start-end)" IPERFFTimeSpace "Transfer Bandwidth XferTime Write/Err\n"; const char report_burst_write_tcp_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX"\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX"%s\n"; #endif const char report_burst_write_tcp_nocwnd_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX "%10" PRIdMAX "NA/%u %s\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %6.3f ms %" PRIdMAX "/%" PRIdMAX "%10" PRIdMAX "NA/%"PRIuLEAST32 "(%" PRIuLEAST32 ")%s\n"; const char report_burst_write_tcp_final_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "=%d:%d:%d:%d:%d:%d:%d:%d%s\n"; /* ------------------------------------------------------------------- * Fullduplex reports * ------------------------------------------------------------------- */ const char report_bw_sum_fullduplex_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec%s\n"; const char report_bw_sum_fullduplex_enhanced_format[] = -"[FD%d] " IPERFTimeFrmt " sec %ss %ss/sec\n"; +"[FD%d] " IPERFTimeFrmt " sec %ss %ss/sec%s\n"; const char report_udp_fullduplex_header[] = "[ ID] Interval Transfer Bandwidth Datagrams PPS\n"; -const char report_sumcnt_udp_fullduplex_header[] = -"[SUM-cnt] Interval Transfer Bandwidth Datagrams PPS\n"; - -const char report_sumcnt_udp_fullduplex_format[] = -"[SUM-%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "%8.0f pps\n"; - const char report_udp_fullduplex_format[] = -"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "%8.0f pps\n"; +"%s" IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "%8.0f pps%s\n"; const char report_udp_fullduplex_enhanced_format[] = -"[FD%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "%8.0f pps\n"; +"[FD%d] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "%8.0f pps%s\n"; const char report_udp_fullduplex_sum_format[] = -"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "%8.0f pps\n"; +"[SUM] " IPERFTimeFrmt " sec %ss %ss/sec %" PRIdMAX "%8.0f pps%s\n"; /* ------------------------------------------------------------------- * Misc reports * ------------------------------------------------------------------- */ const char report_outoforder[] = -"%s" IPERFTimeFrmt " sec %d datagrams received out-of-order\n"; +"%s" IPERFTimeFrmt " sec %d datagrams received out-of-order%s\n"; const char report_sumcnt_outoforder[] = -"[SUM-%d] " IPERFTimeFrmt " sec %d datagrams received out-of-order\n"; +"[SUM-%d] " IPERFTimeFrmt " sec %d datagrams received out-of-order%s\n"; const char report_l2statistics[] = "%s" IPERFTimeFrmt " sec L2 processing detected errors, total(length/checksum/unknown) = %" PRIdMAX "(%" PRIdMAX "/%" PRIdMAX "/%" PRIdMAX ")\n"; const char report_sum_outoforder[] = -"[SUM] " IPERFTimeFrmt " sec %d datagrams received out-of-order\n"; +"[SUM] " IPERFTimeFrmt " sec %d datagrams received out-of-order%s\n"; const char report_peer [] = "%slocal %s port %u connected with %s port %u%s\n"; @@ -629,13 +742,13 @@ const char report_mss[] = "MSS req size %d bytes (per TCP_MAXSEG)\n"; const char report_datagrams[] = -"[%3d] Sent %d datagrams\n"; +"[%3d] Sent %" PRIdMAX " datagrams\n"; const char report_sumcnt_datagrams[] = -"[SUM-%d] Sent %d datagrams\n"; +"[SUM-%d] Sent %" PRIdMAX " datagrams\n"; const char report_sum_datagrams[] = -"[SUM] Sent %d datagrams\n"; +"[SUM] Sent %" PRIdMAX " datagrams\n"; const char server_reporting[] = "[%3d] Server Report:\n"; @@ -644,7 +757,9 @@ const char reportCSV_peer[] = "%s,%u,%s,%u"; const char report_l2length_error[] = -"%s" IPERFTimeFrmt " sec %d datagrams received out-of-order\n"; +"%s" IPERFTimeFrmt " sec %" PRIdMAX " datagrams received out-of-order\n"; + +const char report_client_bb_triptime_clocksync_error[] ="%s" IPERFTimeFrmt " sec Clock sync error count = %" PRIdMAX "\n"; /*------------------------------------------------------------------- * CSV outputs @@ -652,17 +767,32 @@ const char report_l2length_error[] = const char reportCSV_bw_format[] = "%s,%s,%d,%.1f-%.1f,%" PRIdMAX ",%" PRIdMAX "\n"; +const char reportCSV_bw_read_enhanced_header[] = +"time,srcaddress,srcport,dstaddr,dstport,transferid,istart,iend,bytes,speed,readcnt,bin0,bin1,bin2,bin3,bin4,bin5,bin6,bin7\n"; + const char reportCSV_bw_read_enhanced_format[] = -"%s,%s,%d,%.1f-%.1f,%" PRIdMAX ",%" PRIdMAX ",%" PRIdMAX ",%d,%d,%d,%d,%d,%d,%d,%d\n"; +"%s,%s,%d,%.1f,%.1f,%" PRIdMAX ",%" PRIdMAX ",%" PRIdMAX ",%d,%d,%d,%d,%d,%d,%d,%d\n"; + +const char reportCSV_bw_write_enhanced_header[] = +"time,srcaddress,srcport,dstaddr,dstport,transferid,istart,iend,bytes,speed,writecnt,writeerr,tcpretry,tcpcwnd,tcppcwnd,tcprtt,tcprttvar\n"; const char reportCSV_bw_write_enhanced_format[] = -"%s,%s,%d,%.1f-%.1f,%" PRIdMAX ",%" PRIdMAX ",%" PRIdMAX ",%" PRIdMAX ",%" PRIdMAX ",%d,%u,%u\n"; +"%s,%s,%d,%.1f,%.1f,%" PRIdMAX ",%" PRIdMAX ",%" PRIdMAX ",%" PRIdMAX ",%" PRIuLEAST32 ",%" PRIdMAX ",%" PRIuLEAST32 ",%" PRIuLEAST32 ",%" PRIuLEAST32 "\n"; const char reportCSV_bw_jitter_loss_format[] = "%s,%s,%d,%.1f-%.1f,%" PRIdMAX ",%" PRIdMAX ",%.3f,%" PRIdMAX ",%" PRIdMAX ",%.3f,%" PRIdMAX "\n"; +const char reportCSV_bw_jitter_loss_pps_header[] = +"time,srcaddress,srcport,dstaddr,dstport,transferid,istart,iend,bytes,speed,jitter,errors,datagrams,errpercent,outoforder,writecnt,writeerr,pps\n"; + const char reportCSV_bw_jitter_loss_pps_format[] = -"%s,%s,%d,%.1f-%.1f,%" PRIdMAX ",%" PRIdMAX ",%.3f,%" PRIdMAX ",%" PRIdMAX ",%.3f,%" PRIdMAX ",%" PRIdMAX ",%" PRIdMAX ",%f\n"; +"%s,%s,%d,%.1f,%.1f,%" PRIdMAX ",%" PRIdMAX ",%.3f,%" PRIdMAX ",%" PRIdMAX ",%.3f,%" PRIdMAX ",%" PRIdMAX ",%" PRIdMAX ",%f\n"; + +const char reportCSV_client_bb_bw_tcp_header[] = +"time,srcaddress,srcport,dstaddr,dstport,transferid,istart,iend,bytes,speed,bbcnt,bbavg,bbmin,bbmax,bbstdev,tcpretry,tcpcwnd,tcprtt,rps\n"; + +const char reportCSV_client_bb_bw_tcp_format[] = +"%s,%s,%d,%.1f,%.1f,%" PRIdMAX ",%" PRIdMAX ",%" PRIdMAX ",%.3f,%.3f,%.3f,%.3f,%" PRIuLEAST32 ",%" PRIdMAX ",%" PRIuLEAST32 ",%0.1f\n"; /* ------------------------------------------------------------------- * warnings @@ -744,14 +874,16 @@ const char warn_compat_and_peer_exchange[] = "WARNING: Options of '-C' '--compatibility' AND '-X' '--peerdetect' are mutually exclusive, --peerdetect ignored\n"; const char warn_start_before_now[] = -"[%3d] WARNING: --txstart-time (%" PRIdMAX ".%" PRIdMAX ") %s is before now %s\n"; +"[%3d] WARNING: --txstart-time (%ld.%06ld) %s is before now %s\n"; const char error_starttime_exceeds[] = -"ERROR: --txstart-time (%" PRIdMAX ".%" PRIdMAX ") %s exceeds max scheduled delay of %d secs\n"; +"ERROR: --txstart-time %ld.%06ld %s exceeds max scheduled delay of %d secs\n"; const char error_delaytime_exceeds[] = "ERROR: --txdelay-time of %d seconds is more than the supported delay of %d seconds\n"; +const char report_omitted[] = " (omitted)"; + #ifdef __cplusplus } /* end extern "C" */ #endif |