Only print ts->description if set for non-terse output

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 6377869cbab7b504a7b4f7c59222e39d9151b6c7..d310686d1295fb3653a34e656efdb72c98fcfe0e 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -9,7 +9,7 @@
 
 #include "fio.h"
 #include "diskutil.h"
-#include "ieee754.h"
+#include "lib/ieee754.h"
 
 void update_rusage_stat(struct thread_data *td)
 {
@@ -114,23 +114,27 @@ static int double_cmp(const void *a, const void *b)
        return cmp;
 }
 
-/*
- * Find and display the p-th percentile of clat
- */
-static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
-                                 fio_fp64_t *plist)
+static unsigned int calc_clat_percentiles(unsigned int *io_u_plat,
+                                         unsigned long nr, fio_fp64_t *plist,
+                                         unsigned int **output,
+                                         unsigned int *maxv,
+                                         unsigned int *minv)
 {
        unsigned long sum = 0;
-       unsigned int len, i, j = 0, minv = -1U, maxv = 0;
-       unsigned int *ovals = NULL, oval_len = 0;
-       int is_last = 0, scale_down;
+       unsigned int len, i, j = 0;
+       unsigned int oval_len = 0;
+       unsigned int *ovals = NULL;
+       int is_last;
+
+       *minv = -1U;
+       *maxv = 0;
 
        len = 0;
        while (len < FIO_IO_U_LIST_MAX_LEN && plist[len].u.f != 0.0)
                len++;
 
        if (!len)
-               return;
+               return 0;
 
        /*
         * Sort the percentile list. Note that it may already be sorted if
@@ -143,7 +147,8 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
        /*
         * Calculate bucket values, note down max and min values
         */
-       for (i = 0; i < FIO_IO_U_PLAT_NR; i++) {
+       is_last = 0;
+       for (i = 0; i < FIO_IO_U_PLAT_NR && !is_last; i++) {
                sum += io_u_plat[i];
                while (sum >= (plist[j].u.f / 100.0 * nr)) {
                        assert(plist[j].u.f <= 100.0);
@@ -154,14 +159,37 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
                        }
 
                        ovals[j] = plat_idx_to_val(i);
-                       if (ovals[j] < minv)
-                               minv = ovals[j];
-                       if (ovals[j] > maxv)
-                               maxv = ovals[j];
+                       if (ovals[j] < *minv)
+                               *minv = ovals[j];
+                       if (ovals[j] > *maxv)
+                               *maxv = ovals[j];
+
+                       is_last = (j == len - 1);
+                       if (is_last)
+                               break;
+
                        j++;
                }
        }
 
+       *output = ovals;
+       return len;
+}
+
+/*
+ * Find and display the p-th percentile of clat
+ */
+static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
+                                 fio_fp64_t *plist)
+{
+       unsigned int len, j = 0, minv, maxv;
+       unsigned int *ovals;
+       int is_last, scale_down;
+
+       len = calc_clat_percentiles(io_u_plat, nr, plist, &ovals, &maxv, &minv);
+       if (!len)
+               goto out;
+
        /*
         * We default to usecs, but if the value range is such that we
         * should scale down to msecs, do that.
@@ -201,6 +229,7 @@ static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr,
                        log_info("\n");
        }
 
+out:
        if (ovals)
                free(ovals);
 }
@@ -491,7 +520,7 @@ void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs)
                                        ts->error, ts->verror, (int) ts->pid);
        }
 
-       if (ts->description)
+       if (strlen(ts->description))
                log_info("  Description  : [%s]\n", ts->description);
 
        if (ts->io_bytes[DDIR_READ])
@@ -552,16 +581,23 @@ static void show_ddir_status_terse(struct thread_stat *ts,
                                   struct group_run_stats *rs, int ddir)
 {
        unsigned long min, max;
-       unsigned long long bw;
+       unsigned long long bw, iops;
+       unsigned int *ovals = NULL;
        double mean, dev;
+       unsigned int len, minv, maxv;
+       int i;
 
        assert(ddir_rw(ddir));
 
-       bw = 0;
-       if (ts->runtime[ddir])
-               bw = ts->io_bytes[ddir] / ts->runtime[ddir];
+       iops = bw = 0;
+       if (ts->runtime[ddir]) {
+               uint64_t runt = ts->runtime[ddir];
+
+               bw = ts->io_bytes[ddir] / runt;
+               iops = (1000 * (uint64_t) ts->total_io_u[ddir]) / runt;
+       }
 
-       log_info(";%llu;%llu;%llu", ts->io_bytes[ddir] >> 10, bw,
+       log_info(";%llu;%llu;%llu;%llu", ts->io_bytes[ddir] >> 10, bw, iops,
                                                        ts->runtime[ddir]);
 
        if (calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev))
@@ -579,6 +615,24 @@ static void show_ddir_status_terse(struct thread_stat *ts,
        else
                log_info(";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
 
+       if (ts->clat_percentiles) {
+               len = calc_clat_percentiles(ts->io_u_plat[ddir],
+                                       ts->clat_stat[ddir].samples,
+                                       ts->percentile_list, &ovals, &maxv,
+                                       &minv);
+       } else
+               len = 0;
+
+       for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++) {
+               if (i >= len) {
+                       log_info(";0%%=0");
+                       continue;
+               }
+               log_info(";%2.2f%%=%u", ts->percentile_list[i].u.f, ovals[i]);
+       }
+       if (ovals)
+               free(ovals);
+
        if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
                double p_of_agg;
 
@@ -588,7 +642,7 @@ static void show_ddir_status_terse(struct thread_stat *ts,
                log_info(";%lu;%lu;%f%%;%f;%f", 0UL, 0UL, 0.0, 0.0, 0.0);
 }
 
-#define FIO_TERSE_VERSION      "2"
+#define FIO_TERSE_VERSION      "3"
 
 static void show_thread_status_terse(struct thread_stat *ts,
                                     struct group_run_stats *rs)
@@ -637,16 +691,18 @@ static void show_thread_status_terse(struct thread_stat *ts,
        /* Millisecond latency */
        for (i = 0; i < FIO_IO_U_LAT_M_NR; i++)
                log_info(";%3.2f%%", io_u_lat_m[i]);
+
+       /* disk util stats, if any */
+       show_disk_util(1);
+
        /* Additional output if continue_on_error set - default off*/
        if (ts->continue_on_error)
                log_info(";%lu;%d", ts->total_err_count, ts->first_error);
        log_info("\n");
 
        /* Additional output if description is set */
-       if (ts->description)
+       if (strlen(ts->description))
                log_info(";%s", ts->description);
-
-       log_info("\n");
 }
 
 static void sum_stat(struct io_stat *dst, struct io_stat *src, int nr)
@@ -952,7 +1008,7 @@ void show_run_stats(void)
                if (is_backend)
                        fio_server_send_du();
                else
-                       show_disk_util();
+                       show_disk_util(0);
 
                free_disk_util();
        }