X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=681d5cbc47e9b90c85391738554a15da3623be35;hp=e5e626ce862207de52731ddc6fe2d957dd9d2a83;hb=94370ac42ddee6572c434073d3c1840a513bc8f4;hpb=7bdce1bde82e37c8876270853840c1d09d760b67 diff --git a/stat.c b/stat.c index e5e626ce..681d5cbc 100644 --- a/stat.c +++ b/stat.c @@ -741,37 +741,29 @@ void show_run_stats(void) } for (i = 0; i < nr_ts; i++) { - unsigned long long rbw, wbw; + unsigned long long bw; ts = &threadstats[i]; rs = &runstats[ts->groupid]; - if (ts->runtime[0] < rs->min_run[0] || !rs->min_run[0]) - rs->min_run[0] = ts->runtime[0]; - if (ts->runtime[0] > rs->max_run[0]) - rs->max_run[0] = ts->runtime[0]; - if (ts->runtime[1] < rs->min_run[1] || !rs->min_run[1]) - rs->min_run[1] = ts->runtime[1]; - if (ts->runtime[1] > rs->max_run[1]) - rs->max_run[1] = ts->runtime[1]; - - rbw = wbw = 0; - if (ts->runtime[0]) - rbw = ts->io_bytes[0] / (unsigned long long) ts->runtime[0]; - if (ts->runtime[1]) - wbw = ts->io_bytes[1] / (unsigned long long) ts->runtime[1]; - - if (rbw < rs->min_bw[0]) - rs->min_bw[0] = rbw; - if (wbw < rs->min_bw[1]) - rs->min_bw[1] = wbw; - if (rbw > rs->max_bw[0]) - rs->max_bw[0] = rbw; - if (wbw > rs->max_bw[1]) - rs->max_bw[1] = wbw; - - rs->io_kb[0] += ts->io_bytes[0] >> 10; - rs->io_kb[1] += ts->io_bytes[1] >> 10; + for (j = 0; j < 2; j++) { + if (!ts->runtime[j]) + continue; + if (ts->runtime[j] < rs->min_run[j] || !rs->min_run[j]) + rs->min_run[j] = ts->runtime[j]; + if (ts->runtime[j] > rs->max_run[j]) + rs->max_run[j] = ts->runtime[j]; + + bw = 0; + if (ts->runtime[j]) + bw = ts->io_bytes[j] / (unsigned long long) ts->runtime[j]; + if (bw < rs->min_bw[j]) + rs->min_bw[j] = bw; + if (bw > rs->max_bw[j]) + rs->max_bw[j] = bw; + + rs->io_kb[j] += ts->io_bytes[j] >> 10; + } } for (i = 0; i < groupid + 1; i++) {