X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=7443e665deb6c5a2c1869920a5f022f25969e5d9;hp=26f45f4d39a4c58bd6c6fca9c8262cf10c9b2f6d;hb=a462baefd211d1847cefbaa500c8aaad2128374b;hpb=946e42764c6cc536d42e55acbf2fa8bc424124bd diff --git a/stat.c b/stat.c index 26f45f4d..7443e665 100644 --- a/stat.c +++ b/stat.c @@ -1045,10 +1045,11 @@ void show_run_stats(void) bw = 0; if (ts->runtime[j]) { - unsigned long runt; + unsigned long runt = ts->runtime[j]; + unsigned long long kb; - runt = ts->runtime[j]; - bw = ts->io_bytes[j] / runt; + kb = ts->io_bytes[j] / rs->kb_base; + bw = kb * 1000 / runt; } if (bw < rs->min_bw[j]) rs->min_bw[j] = bw; @@ -1060,16 +1061,12 @@ void show_run_stats(void) } for (i = 0; i < groupid + 1; i++) { - unsigned long max_run[2]; - rs = &runstats[i]; - max_run[0] = rs->max_run[0]; - max_run[1] = rs->max_run[1]; if (rs->max_run[0]) - rs->agg[0] = (rs->io_kb[0] * 1000) / max_run[0]; + rs->agg[0] = (rs->io_kb[0] * 1000) / rs->max_run[0]; if (rs->max_run[1]) - rs->agg[1] = (rs->io_kb[1] * 1000) / max_run[1]; + rs->agg[1] = (rs->io_kb[1] * 1000) / rs->max_run[1]; } /* @@ -1105,8 +1102,6 @@ void show_run_stats(void) else if (!terse_output) show_disk_util(0); - free_disk_util(); - free(runstats); free(threadstats); }