Fix clat percentile display
[fio.git] / stat.c
diff --git a/stat.c b/stat.c
index 6c652d6e4f8708039c7074d833471d3e0ddd0c0b..72b84be81e29b192e681a7e1bf8acb0ed77f3de3 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -150,8 +150,8 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
                        /* end of the list */
                        is_last = (j == len - 1);
 
-                       log_info(" %2.2fth=%u%c", plist[j], plat_idx_to_val(i),
-                                (is_last? '\n' : ','));
+                       log_info(" %2.2fth=%u%c", plist[j].u.f,
+                               plat_idx_to_val(i), (is_last? '\n' : ','));
 
                        if (is_last)
                                break;
@@ -642,23 +642,109 @@ static void sum_stat(struct io_stat *dst, struct io_stat *src, int nr)
        dst->S.u.f = S;
 }
 
+void sum_group_stats(struct group_run_stats *dst, struct group_run_stats *src)
+{
+       int i;
+
+       for (i = 0; i < 2; i++) {
+               if (dst->max_run[i] < src->max_run[i])
+                       dst->max_run[i] = src->max_run[i];
+               if (dst->min_run[i] && dst->min_run[i] > src->min_run[i])
+                       dst->min_run[i] = src->min_run[i];
+               if (dst->max_bw[i] < src->max_bw[i])
+                       dst->max_bw[i] = src->max_bw[i];
+               if (dst->min_bw[i] && dst->min_bw[i] > src->min_bw[i])
+                       dst->min_bw[i] = src->min_bw[i];
+
+               dst->io_kb[i] += src->io_kb[i];
+               dst->agg[i] += src->agg[i];
+       }
+
+}
+
+void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, int nr)
+{
+       int l, k;
+
+       for (l = 0; l <= DDIR_WRITE; l++) {
+               sum_stat(&dst->clat_stat[l], &src->clat_stat[l], nr);
+               sum_stat(&dst->slat_stat[l], &src->slat_stat[l], nr);
+               sum_stat(&dst->lat_stat[l], &src->lat_stat[l], nr);
+               sum_stat(&dst->bw_stat[l], &src->bw_stat[l], nr);
+
+               dst->io_bytes[l] += src->io_bytes[l];
+
+               if (dst->runtime[l] < src->runtime[l])
+                       dst->runtime[l] = src->runtime[l];
+       }
+
+       dst->usr_time += src->usr_time;
+       dst->sys_time += src->sys_time;
+       dst->ctx += src->ctx;
+       dst->majf += src->majf;
+       dst->minf += src->minf;
+
+       for (k = 0; k < FIO_IO_U_MAP_NR; k++)
+               dst->io_u_map[k] += src->io_u_map[k];
+       for (k = 0; k < FIO_IO_U_MAP_NR; k++)
+               dst->io_u_submit[k] += src->io_u_submit[k];
+       for (k = 0; k < FIO_IO_U_MAP_NR; k++)
+               dst->io_u_complete[k] += src->io_u_complete[k];
+       for (k = 0; k < FIO_IO_U_LAT_U_NR; k++)
+               dst->io_u_lat_u[k] += src->io_u_lat_u[k];
+       for (k = 0; k < FIO_IO_U_LAT_M_NR; k++)
+               dst->io_u_lat_m[k] += src->io_u_lat_m[k];
+
+       for (k = 0; k <= 2; k++) {
+               dst->total_io_u[k] += src->total_io_u[k];
+               dst->short_io_u[k] += src->short_io_u[k];
+       }
+
+       for (k = 0; k <= DDIR_WRITE; k++) {
+               int m;
+               for (m = 0; m < FIO_IO_U_PLAT_NR; m++)
+                       dst->io_u_plat[k][m] += src->io_u_plat[k][m];
+       }
+
+       dst->total_run_time += src->total_run_time;
+       dst->total_submit += src->total_submit;
+       dst->total_complete += src->total_complete;
+}
+
+void init_group_run_stat(struct group_run_stats *gs)
+{
+       memset(gs, 0, sizeof(*gs));
+       gs->min_bw[0] = gs->min_run[0] = ~0UL;
+       gs->min_bw[1] = gs->min_run[1] = ~0UL;
+}
+
+void init_thread_stat(struct thread_stat *ts)
+{
+       int j;
+
+       memset(ts, 0, sizeof(*ts));
+
+       for (j = 0; j <= DDIR_WRITE; j++) {
+               ts->lat_stat[j].min_val = -1UL;
+               ts->clat_stat[j].min_val = -1UL;
+               ts->slat_stat[j].min_val = -1UL;
+               ts->bw_stat[j].min_val = -1UL;
+       }
+       ts->groupid = -1;
+}
+
 void show_run_stats(void)
 {
        struct group_run_stats *runstats, *rs;
        struct thread_data *td;
        struct thread_stat *threadstats, *ts;
-       int i, j, k, l, nr_ts, last_ts, idx;
+       int i, j, nr_ts, last_ts, idx;
        int kb_base_warned = 0;
 
        runstats = malloc(sizeof(struct group_run_stats) * (groupid + 1));
 
-       for (i = 0; i < groupid + 1; i++) {
-               rs = &runstats[i];
-
-               memset(rs, 0, sizeof(*rs));
-               rs->min_bw[0] = rs->min_run[0] = ~0UL;
-               rs->min_bw[1] = rs->min_run[1] = ~0UL;
-       }
+       for (i = 0; i < groupid + 1; i++)
+               init_group_run_stat(&runstats[i]);
 
        /*
         * find out how many threads stats we need. if group reporting isn't
@@ -680,18 +766,8 @@ void show_run_stats(void)
 
        threadstats = malloc(nr_ts * sizeof(struct thread_stat));
 
-       for (i = 0; i < nr_ts; i++) {
-               ts = &threadstats[i];
-
-               memset(ts, 0, sizeof(*ts));
-               for (j = 0; j <= DDIR_WRITE; j++) {
-                       ts->lat_stat[j].min_val = -1UL;
-                       ts->clat_stat[j].min_val = -1UL;
-                       ts->slat_stat[j].min_val = -1UL;
-                       ts->bw_stat[j].min_val = -1UL;
-               }
-               ts->groupid = -1;
-       }
+       for (i = 0; i < nr_ts; i++)
+               init_thread_stat(&threadstats[i]);
 
        j = 0;
        last_ts = -1;
@@ -755,50 +831,7 @@ void show_run_stats(void)
                        }
                }
 
-               for (l = 0; l <= DDIR_WRITE; 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->lat_stat[l], &td->ts.lat_stat[l], idx);
-                       sum_stat(&ts->bw_stat[l], &td->ts.bw_stat[l], idx);
-
-                       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;
-               ts->ctx += td->ts.ctx;
-               ts->majf += td->ts.majf;
-               ts->minf += td->ts.minf;
-
-               for (k = 0; k < FIO_IO_U_MAP_NR; k++)
-                       ts->io_u_map[k] += td->ts.io_u_map[k];
-               for (k = 0; k < FIO_IO_U_MAP_NR; k++)
-                       ts->io_u_submit[k] += td->ts.io_u_submit[k];
-               for (k = 0; k < FIO_IO_U_MAP_NR; k++)
-                       ts->io_u_complete[k] += td->ts.io_u_complete[k];
-               for (k = 0; k < FIO_IO_U_LAT_U_NR; k++)
-                       ts->io_u_lat_u[k] += td->ts.io_u_lat_u[k];
-               for (k = 0; k < FIO_IO_U_LAT_M_NR; k++)
-                       ts->io_u_lat_m[k] += td->ts.io_u_lat_m[k];
-
-
-               for (k = 0; k <= 2; k++) {
-                       ts->total_io_u[k] += td->ts.total_io_u[k];
-                       ts->short_io_u[k] += td->ts.short_io_u[k];
-               }
-
-               for (k = 0; k <= DDIR_WRITE; k++) {
-                       int m;
-                       for (m = 0; m < FIO_IO_U_PLAT_NR; m++)
-                               ts->io_u_plat[k][m] += td->ts.io_u_plat[k][m];
-               }
-
-               ts->total_run_time += td->ts.total_run_time;
-               ts->total_submit += td->ts.total_submit;
-               ts->total_complete += td->ts.total_complete;
+               sum_thread_stats(ts, &td->ts, idx);
        }
 
        for (i = 0; i < nr_ts; i++) {