commit d607579929581fc861aa6e1e42ee1363bbcf6584
author Tommi Rantala <tt.rantala@gmail.com> Thu Dec 13 23:43:02 2018 +0200
committer Bruce A. Mah <bmah@kitchenlab.org> Thu Dec 13 13:43:02 2018 -0800
tree ee57f431f30bd890864332f01ebf49646f7191bd
parent 901ad59c83e7759faaa185c8d70662b2fe9ffb99

Fix cpu usage calculation regression in cpu_util() (#822)

iperf reported "impossible" CPU usage percentages in JSON output:

    "cpu_utilization_percent":      {
        "host_total":   70907445.679701567,
        "host_user":    1303335.9336584355,
        "host_system":  69604109.746043131,
        "remote_total": 13580675.258652203,
        "remote_user":  540984.0827233647,
        "remote_system":        13039620.331720918
    },

Regression introduced in commit cde81d7 ("Add initial portable time
abstraction"), where "timediff" was accidentally changed from
microseconds to seconds:

  -    timediff = ((temp.tv_sec * 1000000.0 + temp.tv_usec) -
  -                (last.tv_sec * 1000000.0 + last.tv_usec));
  +    iperf_time_diff(&now, &last, &temp_time);
  +    timediff = iperf_time_in_secs(&temp_time);

src/iperf_util.c

diff --git a/src/iperf_util.c b/src/iperf_util.c
index c5af476..412397a 100644
--- a/src/iperf_util.c
+++ b/src/iperf_util.c
@@ -211,7 +211,7 @@
     getrusage(RUSAGE_SELF, &rtemp);
 
     iperf_time_diff(&now, &last, &temp_time);
-    timediff = iperf_time_in_secs(&temp_time);
+    timediff = iperf_time_in_usecs(&temp_time);
 
     userdiff = ((rtemp.ru_utime.tv_sec * 1000000.0 + rtemp.ru_utime.tv_usec) -
                 (rlast.ru_utime.tv_sec * 1000000.0 + rlast.ru_utime.tv_usec));