diff --git a/src/iperf_api.c b/src/iperf_api.c index cc1184e..13f37c7 100644 --- a/src/iperf_api.c +++ b/src/iperf_api.c @@ -1838,10 +1838,8 @@ iperf_print_results(struct iperf_test *test) 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)); - else if (test->verbose) { - iprintf(test, "Host CPU Utilization: %.1f%%\n", test->cpu_util); - iprintf(test, "Remote CPU Utilization: %.1f%%\n", test->remote_cpu_util); - } + else if (test->verbose) + iprintf(test, report_cpu, report_local, test->sender ? report_sender : report_receiver, test->cpu_util, report_remote, test->sender ? report_receiver: report_sender, test->remote_cpu_util); } /**************************************************************************/ diff --git a/src/locale.c b/src/locale.c index dcbb51f..8b1c3cd 100644 --- a/src/locale.c +++ b/src/locale.c @@ -278,6 +278,14 @@ const char server_reporting[] = const char reportCSV_peer[] = "%s,%u,%s,%u"; +const char report_cpu[] = +"CPU Utilization: %s/%s %.1f%%, %s/%s %.1f%%\n"; + +const char report_local[] = "local"; +const char report_remote[] = "remote"; +const char report_sender[] = "sender"; +const char report_receiver[] = "receiver"; + #if defined(linux) const char report_tcpInfo[] = "event=TCP_Info CWND=%u SND_SSTHRESH=%u RCV_SSTHRESH=%u UNACKED=%u SACK=%u LOST=%u RETRANS=%u FACK=%u RTT=%u REORDERING=%u\n"; diff --git a/src/locale.h b/src/locale.h index 8eefce4..7d77024 100644 --- a/src/locale.h +++ b/src/locale.h @@ -65,6 +65,12 @@ extern const char report_sum_datagrams[] ; extern const char server_reporting[] ; extern const char reportCSV_peer[] ; +extern const char report_cpu[] ; +extern const char report_local[] ; +extern const char report_remote[] ; +extern const char report_sender[] ; +extern const char report_receiver[] ; + extern const char report_tcpInfo[] ; extern const char report_tcpInfo[] ;