Fixup reporting for !runtime data directions

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 9fc92d4f2ad3d15eb7ce281ba0b0c5b48c32a26e..681d5cbc47e9b90c85391738554a15da3623be35 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -489,6 +489,9 @@ static void show_thread_status(struct thread_stat *ts,
        else
                fprintf(f_out, "%s: (groupid=%d, jobs=%d): err=%2d (%s): pid=%d\n", ts->name, ts->groupid, ts->members, ts->error, ts->verror, ts->pid);
 
+       if (ts->description)
+               fprintf(f_out, "  Description  : [%s]\n", ts->description);
+
        if (ts->io_bytes[DDIR_READ])
                show_ddir_status(rs, ts, DDIR_READ);
        if (ts->io_bytes[DDIR_WRITE])
@@ -514,9 +517,6 @@ static void show_thread_status(struct thread_stat *ts,
 
        fprintf(f_out, "     lat (msec): 2=%3.1f%%, 4=%3.1f%%, 10=%3.1f%%, 20=%3.1f%%, 50=%3.1f%%, 100=%3.1f%%\n", io_u_lat[0], io_u_lat[1], io_u_lat[2], io_u_lat[3], io_u_lat[4], io_u_lat[5]);
        fprintf(f_out, "     lat (msec): 250=%3.1f%%, 500=%3.1f%%, 750=%3.1f%%, 1000=%3.1f%%, >=2000=%3.1f%%\n", io_u_lat[6], io_u_lat[7], io_u_lat[8], io_u_lat[9], io_u_lat[10]);
-
-       if (ts->description)
-               fprintf(f_out, "%s\n", ts->description);
 }
 
 static void show_ddir_status_terse(struct thread_stat *ts,
@@ -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++) {