client/server: add support for passing disk_util structures
[fio.git] / stat.c
diff --git a/stat.c b/stat.c
index 71eca48e9bf23a731bb9956e2af6cca0b3cf684e..6377869cbab7b504a7b4f7c59222e39d9151b6c7 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -121,13 +121,17 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
                                  fio_fp64_t *plist)
 {
        unsigned long sum = 0;
-       unsigned int len, i, j = 0;
-       int is_last = 0;
+       unsigned int len, i, j = 0, minv = -1U, maxv = 0;
+       unsigned int *ovals = NULL, oval_len = 0;
+       int is_last = 0, scale_down;
 
        len = 0;
        while (len < FIO_IO_U_LIST_MAX_LEN && plist[len].u.f != 0.0)
                len++;
 
+       if (!len)
+               return;
+
        /*
         * Sort the percentile list. Note that it may already be sorted if
         * we are using the default values, but since it's a short list this
@@ -136,31 +140,69 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
        if (len > 1)
                qsort((void*)plist, len, sizeof(plist[0]), double_cmp);
 
-       log_info("    clat percentiles (usec) :");
-
-       for (i = 0; i < FIO_IO_U_PLAT_NR && !is_last; i++) {
+       /*
+        * Calculate bucket values, note down max and min values
+        */
+       for (i = 0; i < FIO_IO_U_PLAT_NR; i++) {
                sum += io_u_plat[i];
                while (sum >= (plist[j].u.f / 100.0 * nr)) {
                        assert(plist[j].u.f <= 100.0);
 
-                       /* for formatting */
-                       if (j != 0 && (j % 4) == 0)
-                               log_info("                             ");
+                       if (j == oval_len) {
+                               oval_len += 100;
+                               ovals = realloc(ovals, oval_len * sizeof(unsigned int));
+                       }
 
-                       /* end of the list */
-                       is_last = (j == len - 1);
+                       ovals[j] = plat_idx_to_val(i);
+                       if (ovals[j] < minv)
+                               minv = ovals[j];
+                       if (ovals[j] > maxv)
+                               maxv = ovals[j];
+                       j++;
+               }
+       }
 
-                       log_info(" %2.2fth=%u%c", plist[j], plat_idx_to_val(i),
-                                (is_last? '\n' : ','));
+       /*
+        * We default to usecs, but if the value range is such that we
+        * should scale down to msecs, do that.
+        */
+       if (minv > 2000 && maxv > 99999) {
+               scale_down = 1;
+               log_info("    clat percentiles (msec):\n     |");
+       } else {
+               scale_down = 0;
+               log_info("    clat percentiles (usec):\n     |");
+       }
 
-                       if (is_last)
-                               break;
+       for (j = 0; j < len; j++) {
+               char fbuf[8];
 
-                       if (j % 4 == 3) /* for formatting */
-                               log_info("\n");
-                       j++;
-               }
+               /* for formatting */
+               if (j != 0 && (j % 4) == 0)
+                       log_info("     |");
+
+               /* end of the list */
+               is_last = (j == len - 1);
+
+               if (plist[j].u.f < 10.0)
+                       sprintf(fbuf, " %2.2f", plist[j].u.f);
+               else
+                       sprintf(fbuf, "%2.2f", plist[j].u.f);
+
+               if (scale_down)
+                       ovals[j] = (ovals[j] + 999) / 1000;
+
+               log_info(" %sth=[%5u]%c", fbuf, ovals[j], is_last ? '\n' : ',');
+
+               if (is_last)
+                       break;
+
+               if (j % 4 == 3) /* for formatting */
+                       log_info("\n");
        }
+
+       if (ovals)
+               free(ovals);
 }
 
 static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max,
@@ -191,7 +233,7 @@ void show_group_stats(struct group_run_stats *rs)
        const char *ddir_str[] = { "   READ", "  WRITE" };
        int i;
 
-       log_info("\nRun status group %d (all jobs):\n", rs->groupid);
+       log_info("Run status group %d (all jobs):\n", rs->groupid);
 
        for (i = 0; i <= DDIR_WRITE; i++) {
                const int i2p = is_power_of_2(rs->kb_base);
@@ -642,6 +684,26 @@ 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;
@@ -691,6 +753,28 @@ void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, int nr)
        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;
@@ -701,13 +785,8 @@ void show_run_stats(void)
 
        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
@@ -729,18 +808,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;
@@ -880,7 +949,12 @@ void show_run_stats(void)
                                show_group_stats(rs);
                }
 
-               show_disk_util();
+               if (is_backend)
+                       fio_server_send_du();
+               else
+                       show_disk_util();
+
+               free_disk_util();
        }
 
        free(runstats);