A few more stat fixes and cleanups
[fio.git] / stat.c
diff --git a/stat.c b/stat.c
index 07c9b62e26907bd8dbd8f8d4b72203a90a868a96..3a1546778eeca8dbf21268f276c16616c8b6f7d2 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -372,7 +372,7 @@ static void show_group_stats(struct group_run_stats *rs, int id)
                p3 = num2str(rs->min_bw[i], 6, 1);
                p4 = num2str(rs->max_bw[i], 6, 1);
 
-               fprintf(f_out, "%s: io=%siB, aggrb=%siB/s, minb=%siB/s, maxb=%siB/s, mint=%llumsec, maxt=%llumsec\n", ddir_str[i], p1, p2, p3, p4, rs->min_run[0], rs->max_run[0]);
+               fprintf(f_out, "%s: io=%siB, aggrb=%siB/s, minb=%siB/s, maxb=%siB/s, mint=%llumsec, maxt=%llumsec\n", ddir_str[i], p1, p2, p3, p4, rs->min_run[i], rs->max_run[i]);
 
                free(p1);
                free(p2);
@@ -412,6 +412,32 @@ static void show_disk_util(void)
        }
 }
 
+static void stat_calc_dist(struct thread_stat *ts, double *io_u_dist)
+{
+       int i;
+
+       /*
+        * Do depth distribution calculations
+        */
+       for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
+               io_u_dist[i] = (double) ts->io_u_map[i] / (double) ts->total_io_u;
+               io_u_dist[i] *= 100.0;
+       }
+}
+
+static void stat_calc_lat(struct thread_stat *ts, double *io_u_lat)
+{
+       int i;
+
+       /*
+        * Do latency distribution calculations
+        */
+       for (i = 0; i < FIO_IO_U_LAT_NR; i++) {
+               io_u_lat[i] = (double) ts->io_u_lat[i] / (double) ts->total_io_u;
+               io_u_lat[i] *= 100.0;
+       }
+}
+
 static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
                             int ddir)
 {
@@ -454,15 +480,17 @@ static void show_thread_status(struct thread_stat *ts,
        unsigned long runtime;
        double io_u_dist[FIO_IO_U_MAP_NR];
        double io_u_lat[FIO_IO_U_LAT_NR];
-       int i;
 
        if (!(ts->io_bytes[0] + ts->io_bytes[1]))
                return;
 
        if (!ts->error)
-               fprintf(f_out, "%s: (groupid=%d): err=%2d: pid=%d\n", ts->name, ts->groupid, ts->error, ts->pid);
+               fprintf(f_out, "%s: (groupid=%d, jobs=%d): err=%2d: pid=%d\n", ts->name, ts->groupid, ts->members, ts->error, ts->pid);
        else
-               fprintf(f_out, "%s: (groupid=%d): err=%2d (%s): pid=%d\n", ts->name, ts->groupid, ts->error, ts->verror, ts->pid);
+               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);
@@ -482,29 +510,13 @@ static void show_thread_status(struct thread_stat *ts,
 
        fprintf(f_out, "  cpu          : usr=%3.2f%%, sys=%3.2f%%, ctx=%lu\n", usr_cpu, sys_cpu, ts->ctx);
 
-       /*
-        * Do depth distribution calculations
-        */
-       for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
-               io_u_dist[i] = (double) ts->io_u_map[i] / (double) ts->total_io_u;
-               io_u_dist[i] *= 100.0;
-       }
+       stat_calc_dist(ts, io_u_dist);
+       stat_calc_lat(ts, io_u_lat);
 
        fprintf(f_out, "  IO depths    : 1=%3.1f%%, 2=%3.1f%%, 4=%3.1f%%, 8=%3.1f%%, 16=%3.1f%%, 32=%3.1f%%, >=64=%3.1f%%\n", io_u_dist[0], io_u_dist[1], io_u_dist[2], io_u_dist[3], io_u_dist[4], io_u_dist[5], io_u_dist[6]);
 
-       /*
-        * Do latency distribution calculations
-        */
-       for (i = 0; i < FIO_IO_U_LAT_NR; i++) {
-               io_u_lat[i] = (double) ts->io_u_lat[i] / (double) ts->total_io_u;
-               io_u_lat[i] *= 100.0;
-       }
-
        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,
@@ -518,34 +530,36 @@ static void show_ddir_status_terse(struct thread_stat *ts,
        if (ts->runtime[ddir])
                bw = ts->io_bytes[ddir] / ts->runtime[ddir];
 
-       fprintf(f_out, ",%llu,%llu,%lu", ts->io_bytes[ddir] >> 10, bw, ts->runtime[ddir]);
+       fprintf(f_out, ";%llu;%llu;%lu", ts->io_bytes[ddir] >> 10, bw, ts->runtime[ddir]);
 
        if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev))
-               fprintf(f_out, ",%lu,%lu,%f,%f", min, max, mean, dev);
+               fprintf(f_out, ";%lu;%lu;%f;%f", min, max, mean, dev);
        else
-               fprintf(f_out, ",%lu,%lu,%f,%f", 0UL, 0UL, 0.0, 0.0);
+               fprintf(f_out, ";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
 
        if (calc_lat(&ts->clat_stat[ddir], &min, &max, &mean, &dev))
-               fprintf(f_out, ",%lu,%lu,%f,%f", min, max, mean, dev);
+               fprintf(f_out, ";%lu;%lu;%f;%f", min, max, mean, dev);
        else
-               fprintf(f_out, ",%lu,%lu,%f,%f", 0UL, 0UL, 0.0, 0.0);
+               fprintf(f_out, ";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
 
        if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
                double p_of_agg;
 
                p_of_agg = mean * 100 / (double) rs->agg[ddir];
-               fprintf(f_out, ",%lu,%lu,%f%%,%f,%f", min, max, p_of_agg, mean, dev);
+               fprintf(f_out, ";%lu;%lu;%f%%;%f;%f", min, max, p_of_agg, mean, dev);
        } else
-               fprintf(f_out, ",%lu,%lu,%f%%,%f,%f", 0UL, 0UL, 0.0, 0.0, 0.0);
+               fprintf(f_out, ";%lu;%lu;%f%%;%f;%f", 0UL, 0UL, 0.0, 0.0, 0.0);
 }
 
 
 static void show_thread_status_terse(struct thread_stat *ts,
                                     struct group_run_stats *rs)
 {
+       double io_u_dist[FIO_IO_U_MAP_NR];
+       double io_u_lat[FIO_IO_U_LAT_NR];
        double usr_cpu, sys_cpu;
 
-       fprintf(f_out, "%s,%d,%d", ts->name, ts->groupid, ts->error);
+       fprintf(f_out, "%s;%d;%d", ts->name, ts->groupid, ts->error);
 
        show_ddir_status_terse(ts, rs, 0);
        show_ddir_status_terse(ts, rs, 1);
@@ -560,10 +574,23 @@ static void show_thread_status_terse(struct thread_stat *ts,
                sys_cpu = 0;
        }
 
-       fprintf(f_out, ",%f%%,%f%%,%lu\n", usr_cpu, sys_cpu, ts->ctx);
+       fprintf(f_out, ";%f%%;%f%%;%lu", usr_cpu, sys_cpu, ts->ctx);
+
+       stat_calc_dist(ts, io_u_dist);
+       stat_calc_lat(ts, io_u_lat);
+
+       fprintf(f_out, ";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%", io_u_dist[0], io_u_dist[1], io_u_dist[2], io_u_dist[3], io_u_dist[4], io_u_dist[5], io_u_dist[6]);
+
+       fprintf(f_out, ";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%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, ";%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%;%3.1f%%", 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", ts->description);
+
+       fprintf(f_out, "\n");
 }
 
-static void __sum_stat(struct io_stat *dst, struct io_stat *src, int nr)
+static void sum_stat(struct io_stat *dst, struct io_stat *src, int nr)
 {
        double mean, S;
 
@@ -587,18 +614,12 @@ static void __sum_stat(struct io_stat *dst, struct io_stat *src, int nr)
        dst->S = S;
 }
 
-static void sum_stat(struct io_stat *dst, struct io_stat *src, int nr)
-{
-       __sum_stat(&dst[DDIR_READ], &src[DDIR_READ], nr);
-       __sum_stat(&dst[DDIR_WRITE], &src[DDIR_WRITE], nr);
-}
-
 void show_run_stats(void)
 {
        struct group_run_stats *runstats, *rs;
        struct thread_data *td;
        struct thread_stat *threadstats, *ts;
-       int i, j, k, nr_ts, last_ts, members;
+       int i, j, k, l, nr_ts, last_ts, idx;
 
        runstats = malloc(sizeof(struct group_run_stats) * (groupid + 1));
 
@@ -634,37 +655,52 @@ void show_run_stats(void)
                ts = &threadstats[i];
 
                memset(ts, 0, sizeof(*ts));
-               ts->clat_stat[0].min_val = -1UL;
-               ts->clat_stat[1].min_val = -1UL;
-               ts->slat_stat[0].min_val = -1UL;
-               ts->slat_stat[1].min_val = -1UL;
-               ts->bw_stat[0].min_val = -1UL;
-               ts->bw_stat[1].min_val = -1UL;
+               for (j = 0; j < 2; j++) {
+                       ts->clat_stat[j].min_val = -1UL;
+                       ts->slat_stat[j].min_val = -1UL;
+                       ts->bw_stat[j].min_val = -1UL;
+               }
        }
 
        j = 0;
        last_ts = -1;
-       members = 0;
+       idx = 0;
        for_each_td(td, i) {
                ts = &threadstats[j];
 
-               members++;
+               idx++;
+               ts->members++;
 
                if (!ts->groupid) {
+                       /*
+                        * These are per-group shared already
+                        */
                        ts->name = td->name;
                        ts->description = td->description;
-                       ts->error = td->error;
                        ts->groupid = td->groupid;
+
+                       /*
+                        * first pid in group, not very useful...
+                        */
                        ts->pid = td->pid;
+               }
+
+               if (td->error && !ts->error) {
+                       ts->error = td->error;
                        ts->verror = td->verror;
                }
 
-               sum_stat(ts->clat_stat, td->ts.clat_stat, members);
-               sum_stat(ts->slat_stat, td->ts.slat_stat, members);
-               sum_stat(ts->bw_stat, td->ts.bw_stat, members);
+               for (l = 0; l < 2; l++) {
+                       sum_stat(&ts->clat_stat[l], &td->ts.clat_stat[l], idx);
+                       sum_stat(&ts->slat_stat[l], &td->ts.slat_stat[l], idx);
+                       sum_stat(&ts->bw_stat[l], &td->ts.bw_stat[l], idx);
 
-               ts->stat_io_bytes[0] += td->ts.stat_io_bytes[0];
-               ts->stat_io_bytes[1] += td->ts.stat_io_bytes[1];
+                       ts->stat_io_bytes[l] += td->ts.stat_io_bytes[l];
+                       ts->io_bytes[l] += td->ts.io_bytes[l];
+
+                       if (ts->runtime[l] < td->ts.runtime[l])
+                               ts->runtime[l] = td->ts.runtime[l];
+               }
 
                ts->usr_time += td->ts.usr_time;
                ts->sys_time += td->ts.sys_time;
@@ -676,18 +712,11 @@ void show_run_stats(void)
                        ts->io_u_lat[k] += td->ts.io_u_lat[k];
 
                ts->total_io_u += td->ts.total_io_u;
-               ts->io_bytes[0] += td->ts.io_bytes[0];
-               ts->io_bytes[1] += td->ts.io_bytes[1];
-
-               if (ts->runtime[0] < td->ts.runtime[0])
-                       ts->runtime[0] = td->ts.runtime[0];
-               if (ts->runtime[1] < td->ts.runtime[1])
-                       ts->runtime[1] = td->ts.runtime[1];
 
                ts->total_run_time += td->ts.total_run_time;
 
                if (!td->group_reporting) {
-                       members = 0;
+                       idx = 0;
                        j++;
                        continue;
                }
@@ -695,7 +724,7 @@ void show_run_stats(void)
                        continue;
 
                if (last_ts != -1) {
-                       members = 0;
+                       idx = 0;
                        j++;
                }
 
@@ -703,37 +732,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++) {
@@ -775,7 +796,7 @@ void show_run_stats(void)
 static inline void add_stat_sample(struct io_stat *is, unsigned long data)
 {
        double val = data;
-       double delta, n;
+       double delta;
 
        if (data > is->max_val)
                is->max_val = data;
@@ -783,8 +804,7 @@ static inline void add_stat_sample(struct io_stat *is, unsigned long data)
                is->min_val = data;
 
        delta = val - is->mean;
-       n = is->samples + 1.0;
-       is->mean += delta / n;
+       is->mean += delta / (is->samples + 1.0);
        is->S += delta * (val - is->mean);
 
        is->samples++;