d/iperf3-tls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added the -T / --title flag.

Browse Source
This commit is contained in:
Jef Poskanzer 2013-11-08 20:31:19 -08:00
parent 243c974f23
commit d38ab4c8df
7 changed files with 95 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/iperf.h
View File

@ -145,6 +145,7 @@ struct iperf_test
int duration; /* total duration of test (-t flag) */ int duration; /* total duration of test (-t flag) */
char *diskfile_name; /* -F option */ char *diskfile_name; /* -F option */
int affinity, server_affinity; /* -A option */ int affinity, server_affinity; /* -A option */
char *title; /* -T option */
int ctrl_sck; int ctrl_sck;
int listener; int listener;

3
src/iperf3.1
View File

@ -117,6 +117,9 @@ instead of the usual write(2).
.BR -O ", " --omit " \fIn\fR" .BR -O ", " --omit " \fIn\fR"
Omit the first n seconds of the test, to skip past the TCP slow-start Omit the first n seconds of the test, to skip past the TCP slow-start
period. period.
.TP
.BR -T ", " --title " \fIstr\fR"
Prefix every output line with this string.
.SH AUTHORS .SH AUTHORS
Iperf was originally written by Mark Gates and Alex Warshavsky. Iperf was originally written by Mark Gates and Alex Warshavsky.

110
src/iperf_api.c
View File

@ -33,6 +33,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sched.h> #include <sched.h>
#include <setjmp.h> #include <setjmp.h>
#include <stdarg.h>
#include "net.h" #include "net.h"
#include "iperf.h" #include "iperf.h"
@ -382,9 +383,9 @@ iperf_on_test_start(struct iperf_test *test)
} else { } else {
if (test->verbose) { if (test->verbose) {
if (test->settings->bytes) if (test->settings->bytes)
printf(test_start_bytes, test->protocol->name, test->num_streams, test->settings->blksize, test->omit, test->settings->bytes); iprintf(test, test_start_bytes, test->protocol->name, test->num_streams, test->settings->blksize, test->omit, test->settings->bytes);
else else
printf(test_start_time, test->protocol->name, test->num_streams, test->settings->blksize, test->omit, test->duration); iprintf(test, test_start_time, test->protocol->name, test->num_streams, test->settings->blksize, test->omit, test->duration);
} }
} }
} }
@ -424,15 +425,15 @@ iperf_on_connect(struct iperf_test *test)
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(test->json_start, "timestamp", iperf_json_printf("time: %s timesecs: %d", now_str, (int64_t) now_secs)); cJSON_AddItemToObject(test->json_start, "timestamp", iperf_json_printf("time: %s timesecs: %d", now_str, (int64_t) now_secs));
else if (test->verbose) else if (test->verbose)
printf("Time: %s\n", now_str); iprintf(test, "Time: %s\n", now_str);
if (test->role == 'c') { if (test->role == 'c') {
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(test->json_start, "connecting_to", iperf_json_printf("host: %s port: %d", test->server_hostname, (int64_t) test->server_port)); cJSON_AddItemToObject(test->json_start, "connecting_to", iperf_json_printf("host: %s port: %d", test->server_hostname, (int64_t) test->server_port));
else { else {
printf("Connecting to host %s, port %d\n", test->server_hostname, test->server_port); iprintf(test, "Connecting to host %s, port %d\n", test->server_hostname, test->server_port);
if (test->reverse) if (test->reverse)
printf("Reverse mode, remote host %s is sending\n", test->server_hostname); iprintf(test, "Reverse mode, remote host %s is sending\n", test->server_hostname);
} }
} else { } else {
len = sizeof(sa); len = sizeof(sa);
@ -445,7 +446,7 @@ iperf_on_connect(struct iperf_test *test)
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(test->json_start, "accepted_connection", iperf_json_printf("host: %s port: %d", ipr, (int64_t) port)); cJSON_AddItemToObject(test->json_start, "accepted_connection", iperf_json_printf("host: %s port: %d", ipr, (int64_t) port));
else else
printf("Accepted connection from %s, port %d\n", ipr, port); iprintf(test, "Accepted connection from %s, port %d\n", ipr, port);
} else { } else {
sa_in6P = (struct sockaddr_in6 *) &sa; sa_in6P = (struct sockaddr_in6 *) &sa;
inet_ntop(AF_INET6, &sa_in6P->sin6_addr, ipr, sizeof(ipr)); inet_ntop(AF_INET6, &sa_in6P->sin6_addr, ipr, sizeof(ipr));
@ -454,7 +455,7 @@ iperf_on_connect(struct iperf_test *test)
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(test->json_start, "accepted_connection", iperf_json_printf("host: %s port: %d", ipr, (int64_t) port)); cJSON_AddItemToObject(test->json_start, "accepted_connection", iperf_json_printf("host: %s port: %d", ipr, (int64_t) port));
else else
printf("Accepted connection from %s, port %d\n", ipr, port); iprintf(test, "Accepted connection from %s, port %d\n", ipr, port);
} }
} }
if (test->json_output) { if (test->json_output) {
@ -467,14 +468,14 @@ iperf_on_connect(struct iperf_test *test)
cJSON_AddIntToObject(test->json_start, "tcp_mss_default", opt); cJSON_AddIntToObject(test->json_start, "tcp_mss_default", opt);
} }
} else if (test->verbose) { } else if (test->verbose) {
printf(" Cookie: %s\n", test->cookie); iprintf(test, " Cookie: %s\n", test->cookie);
if (test->protocol->id == SOCK_STREAM) { if (test->protocol->id == SOCK_STREAM) {
if (test->settings->mss) if (test->settings->mss)
printf(" TCP MSS: %d\n", test->settings->mss); iprintf(test, " TCP MSS: %d\n", test->settings->mss);
else { else {
len = sizeof(opt); len = sizeof(opt);
getsockopt(test->ctrl_sck, IPPROTO_TCP, TCP_MAXSEG, &opt, &len); getsockopt(test->ctrl_sck, IPPROTO_TCP, TCP_MAXSEG, &opt, &len);
printf(" TCP MSS: %d (default)\n", opt); iprintf(test, " TCP MSS: %d (default)\n", opt);
} }
} }
@ -522,6 +523,7 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
{"omit", required_argument, NULL, 'O'}, {"omit", required_argument, NULL, 'O'},
{"file", required_argument, NULL, 'F'}, {"file", required_argument, NULL, 'F'},
{"affinity", required_argument, NULL, 'A'}, {"affinity", required_argument, NULL, 'A'},
{"title", required_argument, NULL, 'T'},
{"help", no_argument, NULL, 'h'}, {"help", no_argument, NULL, 'h'},
/* XXX: The following ifdef needs to be split up. linux-congestion is not /* XXX: The following ifdef needs to be split up. linux-congestion is not
@ -539,7 +541,7 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
blksize = 0; blksize = 0;
server_flag = client_flag = rate_flag = 0; server_flag = client_flag = rate_flag = 0;
while ((flag = getopt_long(argc, argv, "p:f:i:DVJdvsc:ub:t:n:l:P:Rw:B:M:N46S:L:ZO:F:A:h", longopts, NULL)) != -1) { while ((flag = getopt_long(argc, argv, "p:f:i:DVJdvsc:ub:t:n:l:P:Rw:B:M:N46S:L:ZO:F:A:T:h", longopts, NULL)) != -1) {
switch (flag) { switch (flag) {
case 'p': case 'p':
test->server_port = atoi(optarg); test->server_port = atoi(optarg);
@ -705,6 +707,11 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
client_flag = 1; client_flag = 1;
} }
break; break;
case 'T':
test->title = malloc(strlen(optarg) + 4);
sprintf(test->title, "%s: ", optarg);
client_flag = 1;
break;
case 'h': case 'h':
default: default:
usage_long(); usage_long();
@ -1014,6 +1021,8 @@ send_parameters(struct iperf_test *test)
cJSON_AddIntToObject(j, "TOS", test->settings->tos); cJSON_AddIntToObject(j, "TOS", test->settings->tos);
if (test->settings->flowlabel) if (test->settings->flowlabel)
cJSON_AddIntToObject(j, "flowlabel", test->settings->flowlabel); cJSON_AddIntToObject(j, "flowlabel", test->settings->flowlabel);
if (test->title)
cJSON_AddStringToObject(j, "title", test->title);
if (JSON_write(test->ctrl_sck, j) < 0) { if (JSON_write(test->ctrl_sck, j) < 0) {
i_errno = IESENDPARAMS; i_errno = IESENDPARAMS;
r = -1; r = -1;
@ -1067,6 +1076,8 @@ get_parameters(struct iperf_test *test)
test->settings->tos = j_p->valueint; test->settings->tos = j_p->valueint;
if ((j_p = cJSON_GetObjectItem(j, "flowlabel")) != NULL) if ((j_p = cJSON_GetObjectItem(j, "flowlabel")) != NULL)
test->settings->flowlabel = j_p->valueint; test->settings->flowlabel = j_p->valueint;
if ((j_p = cJSON_GetObjectItem(j, "title")) != NULL)
test->title = strdup(j_p->valuestring);
if (test->sender && test->protocol->id == Ptcp && has_tcpinfo_retransmits()) if (test->sender && test->protocol->id == Ptcp && has_tcpinfo_retransmits())
test->sender_has_retransmits = 1; test->sender_has_retransmits = 1;
cJSON_Delete(j); cJSON_Delete(j);
@ -1324,7 +1335,7 @@ connect_msg(struct iperf_stream *sp)
if (sp->test->json_output) if (sp->test->json_output)
cJSON_AddItemToObject(sp->test->json_start, "connected", iperf_json_printf("socket: %d local_host: %s local_port: %d remote_host: %s remote_port: %d", (int64_t) sp->socket, ipl, (int64_t) lport, ipr, (int64_t) rport)); cJSON_AddItemToObject(sp->test->json_start, "connected", iperf_json_printf("socket: %d local_host: %s local_port: %d remote_host: %s remote_port: %d", (int64_t) sp->socket, ipl, (int64_t) lport, ipr, (int64_t) rport));
else else
printf("[%3d] local %s port %d connected to %s port %d\n", sp->socket, ipl, lport, ipr, rport); iprintf(sp->test, "[%3d] local %s port %d connected to %s port %d\n", sp->socket, ipl, lport, ipr, rport);
} }
@ -1360,6 +1371,7 @@ iperf_defaults(struct iperf_test *testp)
testp->diskfile_name = (char*) 0; testp->diskfile_name = (char*) 0;
testp->affinity = -1; testp->affinity = -1;
testp->server_affinity = -1; testp->server_affinity = -1;
testp->title = NULL;
testp->server_port = PORT; testp->server_port = PORT;
testp->ctrl_sck = -1; testp->ctrl_sck = -1;
testp->prot_listener = -1; testp->prot_listener = -1;
@ -1443,6 +1455,8 @@ iperf_free_test(struct iperf_test *test)
free(test->server_hostname); free(test->server_hostname);
free(test->bind_address); free(test->bind_address);
free(test->settings); free(test->settings);
if (test->title)
free(test->title);
if (test->omit_timer != NULL) if (test->omit_timer != NULL)
tmr_cancel(test->omit_timer); tmr_cancel(test->omit_timer);
if (test->timer != NULL) if (test->timer != NULL)
@ -1504,6 +1518,7 @@ iperf_reset_test(struct iperf_test *test)
test->omit = OMIT; test->omit = OMIT;
test->duration = DURATION; test->duration = DURATION;
test->server_affinity = -1; test->server_affinity = -1;
test->title = NULL;
test->state = 0; test->state = 0;
test->server_hostname = NULL; test->server_hostname = NULL;
@ -1662,12 +1677,12 @@ iperf_print_intermediate(struct iperf_test *test)
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(json_interval, "sum", iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f retransmits: %d omitted: %b", (double) start_time, (double) end_time, (double) irp->interval_duration, (int64_t) bytes, bandwidth * 8, (int64_t) retransmits, irp->omitted)); cJSON_AddItemToObject(json_interval, "sum", iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f retransmits: %d omitted: %b", (double) start_time, (double) end_time, (double) irp->interval_duration, (int64_t) bytes, bandwidth * 8, (int64_t) retransmits, irp->omitted));
else else
printf(report_sum_bw_retrans_format, start_time, end_time, ubuf, nbuf, retransmits, irp->omitted?report_omitted:""); iprintf(test, report_sum_bw_retrans_format, start_time, end_time, ubuf, nbuf, retransmits, irp->omitted?report_omitted:"");
} else { } else {
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(json_interval, "sum", iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f omitted: %b", (double) start_time, (double) end_time, (double) irp->interval_duration, (int64_t) bytes, bandwidth * 8, test->omitting)); cJSON_AddItemToObject(json_interval, "sum", iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f omitted: %b", (double) start_time, (double) end_time, (double) irp->interval_duration, (int64_t) bytes, bandwidth * 8, test->omitting));
else else
printf(report_sum_bw_format, start_time, end_time, ubuf, nbuf, test->omitting?report_omitted:""); iprintf(test, report_sum_bw_format, start_time, end_time, ubuf, nbuf, test->omitting?report_omitted:"");
} }
} }
} }
@ -1699,14 +1714,14 @@ iperf_print_results(struct iperf_test *test)
cJSON_AddItemToObject(test->json_end, "streams", json_summary_streams); cJSON_AddItemToObject(test->json_end, "streams", json_summary_streams);
} else { } else {
if (test->verbose) if (test->verbose)
printf("Test Complete. Summary Results:\n"); iprintf(test, "Test Complete. Summary Results:\n");
if (test->protocol->id == Ptcp) if (test->protocol->id == Ptcp)
if (test->sender_has_retransmits) if (test->sender_has_retransmits)
fputs(report_bw_retrans_header, stdout); iprintf(test, report_bw_retrans_header);
else else
fputs(report_bw_header, stdout); iprintf(test, report_bw_header);
else else
fputs(report_bw_udp_header, stdout); iprintf(test, report_bw_udp_header);
} }
start_time = 0.; start_time = 0.;
@ -1740,28 +1755,28 @@ iperf_print_results(struct iperf_test *test)
unit_snprintf(nbuf, UNIT_LEN, bandwidth, test->settings->unit_format); unit_snprintf(nbuf, UNIT_LEN, bandwidth, test->settings->unit_format);
if (test->protocol->id == Ptcp) { if (test->protocol->id == Ptcp) {
if (!test->json_output) if (!test->json_output)
fputs(" Sent\n", stdout); iprintf(test, " Sent\n");
if (test->sender_has_retransmits) { if (test->sender_has_retransmits) {
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(json_summary_stream, "sent", 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)); cJSON_AddItemToObject(json_summary_stream, "sent", 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 else
printf(report_bw_retrans_format, sp->socket, start_time, end_time, ubuf, nbuf, sp->result->stream_retrans, ""); iprintf(test, report_bw_retrans_format, sp->socket, start_time, end_time, ubuf, nbuf, sp->result->stream_retrans, "");
} else { } else {
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(json_summary_stream, "sent", iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f", (int64_t) sp->socket, (double) start_time, (double) end_time, (double) end_time, (int64_t) bytes_sent, bandwidth * 8)); cJSON_AddItemToObject(json_summary_stream, "sent", iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f", (int64_t) sp->socket, (double) start_time, (double) end_time, (double) end_time, (int64_t) bytes_sent, bandwidth * 8));
else else
printf(report_bw_format, sp->socket, start_time, end_time, ubuf, nbuf, ""); iprintf(test, report_bw_format, sp->socket, start_time, end_time, ubuf, nbuf, "");
} }
} else { } else {
out_of_order_percent = 100.0 * sp->cnt_error / (sp->packet_count - sp->omitted_packet_count); out_of_order_percent = 100.0 * sp->cnt_error / (sp->packet_count - sp->omitted_packet_count);
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(json_summary_stream, "udp", iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f jitter_ms: %f outoforder: %d packets: %d percent: %f", (int64_t) sp->socket, (double) start_time, (double) end_time, (double) end_time, (int64_t) bytes_sent, bandwidth * 8, (double) sp->jitter * 1000.0, (int64_t) sp->cnt_error, (int64_t) (sp->packet_count - sp->omitted_packet_count), out_of_order_percent)); cJSON_AddItemToObject(json_summary_stream, "udp", iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f jitter_ms: %f outoforder: %d packets: %d percent: %f", (int64_t) sp->socket, (double) start_time, (double) end_time, (double) end_time, (int64_t) bytes_sent, bandwidth * 8, (double) sp->jitter * 1000.0, (int64_t) sp->cnt_error, (int64_t) (sp->packet_count - sp->omitted_packet_count), out_of_order_percent));
else { else {
printf(report_bw_udp_format, sp->socket, start_time, end_time, ubuf, nbuf, sp->jitter * 1000.0, sp->cnt_error, (sp->packet_count - sp->omitted_packet_count), out_of_order_percent); iprintf(test, report_bw_udp_format, sp->socket, start_time, end_time, ubuf, nbuf, sp->jitter * 1000.0, sp->cnt_error, (sp->packet_count - sp->omitted_packet_count), out_of_order_percent);
if (test->role == 'c') if (test->role == 'c')
printf(report_datagrams, sp->socket, (sp->packet_count - sp->omitted_packet_count)); iprintf(test, report_datagrams, sp->socket, (sp->packet_count - sp->omitted_packet_count));
if (sp->outoforder_packets > 0) if (sp->outoforder_packets > 0)
printf(report_sum_outoforder, start_time, end_time, sp->cnt_error); iprintf(test, report_sum_outoforder, start_time, end_time, sp->cnt_error);
} }
} }
@ -1772,7 +1787,7 @@ iperf_print_results(struct iperf_test *test)
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(json_summary_stream, "diskfile", iperf_json_printf("sent: %d size: %d percent: %d filename: %s", (int64_t) bytes_sent, (int64_t) sb.st_size, (int64_t) percent, test->diskfile_name)); cJSON_AddItemToObject(json_summary_stream, "diskfile", iperf_json_printf("sent: %d size: %d percent: %d filename: %s", (int64_t) bytes_sent, (int64_t) sb.st_size, (int64_t) percent, test->diskfile_name));
else else
printf(" Sent %s / %s (%d%%) of %s\n", ubuf, sbuf, percent, test->diskfile_name); iprintf(test, " Sent %s / %s (%d%%) of %s\n", ubuf, sbuf, percent, test->diskfile_name);
} }
} }
@ -1781,11 +1796,11 @@ iperf_print_results(struct iperf_test *test)
unit_snprintf(nbuf, UNIT_LEN, bandwidth, test->settings->unit_format); unit_snprintf(nbuf, UNIT_LEN, bandwidth, test->settings->unit_format);
if (test->protocol->id == Ptcp) { if (test->protocol->id == Ptcp) {
if (!test->json_output) if (!test->json_output)
printf(" Received\n"); iprintf(test, " Received\n");
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(json_summary_stream, "received", iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f", (int64_t) sp->socket, (double) start_time, (double) end_time, (double) end_time, (int64_t) bytes_received, bandwidth * 8)); cJSON_AddItemToObject(json_summary_stream, "received", iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f", (int64_t) sp->socket, (double) start_time, (double) end_time, (double) end_time, (int64_t) bytes_received, bandwidth * 8));
else else
printf(report_bw_format, sp->socket, start_time, end_time, ubuf, nbuf, ""); iprintf(test, report_bw_format, sp->socket, start_time, end_time, ubuf, nbuf, "");
} }
} }
@ -1795,42 +1810,42 @@ iperf_print_results(struct iperf_test *test)
unit_snprintf(nbuf, UNIT_LEN, bandwidth, test->settings->unit_format); unit_snprintf(nbuf, UNIT_LEN, bandwidth, test->settings->unit_format);
if (test->protocol->id == Ptcp) { if (test->protocol->id == Ptcp) {
if (!test->json_output) if (!test->json_output)
printf(" Total sent\n"); iprintf(test, " Total sent\n");
if (test->sender_has_retransmits) { if (test->sender_has_retransmits) {
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(test->json_end, "sum_sent", iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f retransmits: %d", (double) start_time, (double) end_time, (double) end_time, (int64_t) total_sent, bandwidth * 8, (int64_t) total_retransmits)); cJSON_AddItemToObject(test->json_end, "sum_sent", iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f retransmits: %d", (double) start_time, (double) end_time, (double) end_time, (int64_t) total_sent, bandwidth * 8, (int64_t) total_retransmits));
else else
printf(report_sum_bw_retrans_format, start_time, end_time, ubuf, nbuf, total_retransmits, ""); iprintf(test, report_sum_bw_retrans_format, start_time, end_time, ubuf, nbuf, total_retransmits, "");
} else { } else {
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(test->json_end, "sum_sent", iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f", (double) start_time, (double) end_time, (double) end_time, (int64_t) total_sent, bandwidth * 8)); cJSON_AddItemToObject(test->json_end, "sum_sent", iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f", (double) start_time, (double) end_time, (double) end_time, (int64_t) total_sent, bandwidth * 8));
else else
printf(report_sum_bw_format, start_time, end_time, ubuf, nbuf, ""); iprintf(test, report_sum_bw_format, start_time, end_time, ubuf, nbuf, "");
} }
unit_snprintf(ubuf, UNIT_LEN, (double) total_received, 'A'); unit_snprintf(ubuf, UNIT_LEN, (double) total_received, 'A');
bandwidth = (double) total_received / (double) end_time; bandwidth = (double) total_received / (double) end_time;
unit_snprintf(nbuf, UNIT_LEN, bandwidth, test->settings->unit_format); unit_snprintf(nbuf, UNIT_LEN, bandwidth, test->settings->unit_format);
if (!test->json_output) if (!test->json_output)
printf(" Total received\n"); iprintf(test, " Total received\n");
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(test->json_end, "sum_received", iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f", (double) start_time, (double) end_time, (double) end_time, (int64_t) total_received, bandwidth * 8)); cJSON_AddItemToObject(test->json_end, "sum_received", iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f", (double) start_time, (double) end_time, (double) end_time, (int64_t) total_received, bandwidth * 8));
else else
printf(report_sum_bw_format, start_time, end_time, ubuf, nbuf, ""); iprintf(test, report_sum_bw_format, start_time, end_time, ubuf, nbuf, "");
} else { } else {
avg_jitter /= test->num_streams; avg_jitter /= test->num_streams;
loss_percent = 100.0 * lost_packets / total_packets; loss_percent = 100.0 * lost_packets / total_packets;
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(test->json_end, "sum", iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f jitter_ms: %f lost_packets: %d total_packets: %d loss_percent: %f", (double) start_time, (double) end_time, (double) end_time, (int64_t) total_sent, bandwidth * 8, avg_jitter, (int64_t) lost_packets, (int64_t) total_packets, loss_percent)); cJSON_AddItemToObject(test->json_end, "sum", iperf_json_printf("start: %f end: %f seconds: %f bytes: %d bits_per_second: %f jitter_ms: %f lost_packets: %d total_packets: %d loss_percent: %f", (double) start_time, (double) end_time, (double) end_time, (int64_t) total_sent, bandwidth * 8, avg_jitter, (int64_t) lost_packets, (int64_t) total_packets, loss_percent));
else else
printf(report_sum_bw_udp_format, start_time, end_time, ubuf, nbuf, avg_jitter, lost_packets, total_packets, loss_percent); iprintf(test, report_sum_bw_udp_format, start_time, end_time, ubuf, nbuf, avg_jitter, lost_packets, total_packets, loss_percent);
} }
} }
if (test->json_output) if (test->json_output)
cJSON_AddItemToObject(test->json_end, "cpu_utilization_percent", iperf_json_printf("host: %f remote: %f", (double) test->cpu_util, (double) test->remote_cpu_util)); cJSON_AddItemToObject(test->json_end, "cpu_utilization_percent", iperf_json_printf("host: %f remote: %f", (double) test->cpu_util, (double) test->remote_cpu_util));
else if (test->verbose) { else if (test->verbose) {
printf("Host CPU Utilization: %.1f%%\n", test->cpu_util); iprintf(test, "Host CPU Utilization: %.1f%%\n", test->cpu_util);
printf("Remote CPU Utilization: %.1f%%\n", test->remote_cpu_util); iprintf(test, "Remote CPU Utilization: %.1f%%\n", test->remote_cpu_util);
} }
} }
@ -1882,11 +1897,11 @@ print_interval_results(struct iperf_test *test, struct iperf_stream *sp, cJSON *
*/ */
if (timeval_equals(&sp->result->start_time, &irp->interval_start_time)) if (timeval_equals(&sp->result->start_time, &irp->interval_start_time))
if (test->sender && test->sender_has_retransmits) if (test->sender && test->sender_has_retransmits)
fputs(report_bw_retrans_header, stdout); iprintf(test, report_bw_retrans_header);
else else
fputs(report_bw_header, stdout); iprintf(test, report_bw_header);
else if (test->num_streams > 1) else if (test->num_streams > 1)
fputs(report_bw_separator, stdout); iprintf(test, report_bw_separator);
} }
} }
@ -1901,12 +1916,12 @@ print_interval_results(struct iperf_test *test, struct iperf_stream *sp, cJSON *
if (test->json_output) 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 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, irp->omitted)); cJSON_AddItemToArray(json_interval_streams, iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f retransmits: %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, irp->omitted));
else else
printf(report_bw_retrans_format, sp->socket, st, et, ubuf, nbuf, irp->interval_retrans, irp->omitted?report_omitted:""); iprintf(test, report_bw_retrans_format, sp->socket, st, et, ubuf, nbuf, irp->interval_retrans, irp->omitted?report_omitted:"");
} else { } else {
if (test->json_output) 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 omitted: %b", (int64_t) sp->socket, (double) st, (double) et, (double) irp->interval_duration, (int64_t) irp->bytes_transferred, bandwidth * 8, irp->omitted)); cJSON_AddItemToArray(json_interval_streams, iperf_json_printf("socket: %d start: %f end: %f seconds: %f bytes: %d bits_per_second: %f omitted: %b", (int64_t) sp->socket, (double) st, (double) et, (double) irp->interval_duration, (int64_t) irp->bytes_transferred, bandwidth * 8, irp->omitted));
else else
printf(report_bw_format, sp->socket, st, et, ubuf, nbuf, irp->omitted?report_omitted:""); iprintf(test, report_bw_format, sp->socket, st, et, ubuf, nbuf, irp->omitted?report_omitted:"");
} }
} }
@ -2133,6 +2148,8 @@ iperf_json_start(struct iperf_test *test)
test->json_top = cJSON_CreateObject(); test->json_top = cJSON_CreateObject();
if (test->json_top == NULL) if (test->json_top == NULL)
return -1; return -1;
if (test->title)
cJSON_AddStringToObject(test->json_top, "title", test->title);
test->json_start = cJSON_CreateObject(); test->json_start = cJSON_CreateObject();
if (test->json_start == NULL) if (test->json_start == NULL)
return -1; return -1;
@ -2208,3 +2225,16 @@ iperf_clearaffinity(void)
#endif /*linux*/ #endif /*linux*/
} }
int
iprintf(struct iperf_test *test, const char* format, ...)
{
va_list argp;
int r;
if (test->title)
fputs(test->title, stdout);
va_start(argp, format);
r = vprintf(format, argp);
va_end(argp);
return r;
}

4
src/iperf_api.h
View File

@ -213,6 +213,10 @@ int iperf_json_finish(struct iperf_test *);
int iperf_setaffinity(int affinity); int iperf_setaffinity(int affinity);
int iperf_clearaffinity(void); int iperf_clearaffinity(void);
/* Custom printf routine. */
int iprintf(struct iperf_test *test, const char *format, ...) __attribute__ ((format(printf,2,3)));
/* Error routines. */ /* Error routines. */
void iperf_err(struct iperf_test *test, const char *format, ...) __attribute__ ((format(printf,2,3))); void iperf_err(struct iperf_test *test, const char *format, ...) __attribute__ ((format(printf,2,3)));
void iperf_errexit(struct iperf_test *test, const char *format, ...) __attribute__ ((format(printf,2,3),noreturn)); void iperf_errexit(struct iperf_test *test, const char *format, ...) __attribute__ ((format(printf,2,3),noreturn));

12
src/iperf_client_api.c
View File

@ -131,7 +131,7 @@ client_omit_timer_proc(TimerClientData client_data, struct timeval *nowP)
test->omitting = 0; test->omitting = 0;
iperf_reset_stats(test); iperf_reset_stats(test);
if (test->verbose && !test->json_output && test->reporter_interval == 0) if (test->verbose && !test->json_output && test->reporter_interval == 0)
printf("Finished omit period, starting real test\n"); iprintf(test, "Finished omit period, starting real test\n");
/* Reset the timers. */ /* Reset the timers. */
if (test->stats_timer != NULL) if (test->stats_timer != NULL)
@ -340,7 +340,9 @@ iperf_run_client(struct iperf_test * test)
cJSON_AddItemToObject(test->json_start, "version", cJSON_CreateString(version)); cJSON_AddItemToObject(test->json_start, "version", cJSON_CreateString(version));
cJSON_AddItemToObject(test->json_start, "system_info", cJSON_CreateString(get_system_info())); cJSON_AddItemToObject(test->json_start, "system_info", cJSON_CreateString(get_system_info()));
} else if (test->verbose) { } else if (test->verbose) {
printf("%s\n", version); iprintf(test, "%s\n", version);
iprintf(test, " ");
fflush(stdout);
system("uname -a"); system("uname -a");
} }
@ -444,8 +446,10 @@ iperf_run_client(struct iperf_test * test)
if (test->json_output) { if (test->json_output) {
if (iperf_json_finish(test) < 0) if (iperf_json_finish(test) < 0)
return -1; return -1;
} else } else {
printf("\niperf Done.\n"); iprintf(test, "\n");
iprintf(test, "iperf Done.\n");
}
return 0; return 0;
} }

13
src/iperf_server_api.c
View File

@ -88,15 +88,15 @@ iperf_server_listen(struct iperf_test *test)
if (test->settings->socket_bufsize > 0) { if (test->settings->socket_bufsize > 0) {
unit_snprintf(ubuf, UNIT_LEN, (double) x, 'A'); unit_snprintf(ubuf, UNIT_LEN, (double) x, 'A');
if (!test->json_output) if (!test->json_output)
printf("TCP window size: %s\n", ubuf); iprintf(test, "TCP window size: %s\n", ubuf);
} else { } else {
if (!test->json_output) if (!test->json_output)
printf("Using TCP Autotuning\n"); iprintf(test, "Using TCP Autotuning\n");
} }
} }
*/ */
if (!test->json_output) if (!test->json_output)
printf("-----------------------------------------------------------\n"); iprintf(test, "-----------------------------------------------------------\n");
FD_ZERO(&test->read_set); FD_ZERO(&test->read_set);
FD_ZERO(&test->write_set); FD_ZERO(&test->write_set);
@ -256,6 +256,7 @@ iperf_test_reset(struct iperf_test *test)
test->diskfile_name = (char*) 0; test->diskfile_name = (char*) 0;
test->affinity = -1; test->affinity = -1;
test->server_affinity = -1; test->server_affinity = -1;
test->title = NULL;
test->state = 0; test->state = 0;
test->server_hostname = NULL; test->server_hostname = NULL;
@ -342,7 +343,7 @@ server_omit_timer_proc(TimerClientData client_data, struct timeval *nowP)
test->omitting = 0; test->omitting = 0;
iperf_reset_stats(test); iperf_reset_stats(test);
if (test->verbose && !test->json_output && test->reporter_interval == 0) if (test->verbose && !test->json_output && test->reporter_interval == 0)
printf("Finished omit period, starting real test\n"); iprintf(test, "Finished omit period, starting real test\n");
/* Reset the timers. */ /* Reset the timers. */
if (test->stats_timer != NULL) if (test->stats_timer != NULL)
@ -434,7 +435,9 @@ iperf_run_server(struct iperf_test *test)
cJSON_AddItemToObject(test->json_start, "version", cJSON_CreateString(version)); cJSON_AddItemToObject(test->json_start, "version", cJSON_CreateString(version));
cJSON_AddItemToObject(test->json_start, "system_info", cJSON_CreateString(get_system_info())); cJSON_AddItemToObject(test->json_start, "system_info", cJSON_CreateString(get_system_info()));
} else if (test->verbose) { } else if (test->verbose) {
printf("%s\n", version); iprintf(test, "%s\n", version);
iprintf(test, " ");
fflush(stdout);
system("uname -a"); system("uname -a");
} }

1
src/locale.c
View File

@ -101,6 +101,7 @@ const char usage_longstr[] = "Usage: iperf [-s|-c host] [options]\n"
/* " -L, --flowlabel N set the IPv6 'flow label'\n" */ /* " -L, --flowlabel N set the IPv6 'flow label'\n" */
" -Z, --zerocopy use a 'zero copy' method of sending data\n" " -Z, --zerocopy use a 'zero copy' method of sending data\n"
" -O, --omit N omit the first n seconds\n" " -O, --omit N omit the first n seconds\n"
" -T, --title str prefix every output line with this string\n"
#ifdef NOT_YET_SUPPORTED /* still working on these */ #ifdef NOT_YET_SUPPORTED /* still working on these */
" -D, --daemon run the server as a daemon\n" " -D, --daemon run the server as a daemon\n"