Add some comments around the terse output

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index a79c7ef29da473567debc712f3c6909b077f7a13..b5ff0101b7b0feca625721bc10b351a48825a271 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -157,6 +157,8 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
        char *io_p, *bw_p, *iops_p;
        int i2p;
 
+       assert(ddir_rw(ddir));
+
        if (!ts->runtime[ddir])
                return;
 
@@ -349,9 +351,11 @@ static void show_thread_status(struct thread_stat *ts,
                                        io_u_dist[1], io_u_dist[2],
                                        io_u_dist[3], io_u_dist[4],
                                        io_u_dist[5], io_u_dist[6]);
-       log_info("     issued r/w: total=%lu/%lu, short=%lu/%lu\n",
+       log_info("     issued r/w/d: total=%lu/%lu/%lu, short=%lu/%lu/%lu\n",
                                        ts->total_io_u[0], ts->total_io_u[1],
-                                       ts->short_io_u[0], ts->short_io_u[1]);
+                                       ts->total_io_u[2],
+                                       ts->short_io_u[0], ts->short_io_u[1],
+                                       ts->short_io_u[2]);
        stat_calc_lat_u(ts, io_u_lat_u);
        stat_calc_lat_m(ts, io_u_lat_m);
        show_latencies(io_u_lat_u, io_u_lat_m);
@@ -370,6 +374,8 @@ static void show_ddir_status_terse(struct thread_stat *ts,
        unsigned long long bw;
        double mean, dev;
 
+       assert(ddir_rw(ddir));
+
        bw = 0;
        if (ts->runtime[ddir])
                bw = ts->io_bytes[ddir] / ts->runtime[ddir];
@@ -401,6 +407,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"
 
 static void show_thread_status_terse(struct thread_stat *ts,
                                     struct group_run_stats *rs)
@@ -411,11 +418,15 @@ static void show_thread_status_terse(struct thread_stat *ts,
        double usr_cpu, sys_cpu;
        int i;
 
-       log_info("%s;%d;%d", ts->name, ts->groupid, ts->error);
-
+       /* General Info */
+       log_info("%s;%s;%d;%d", FIO_TERSE_VERSION, ts->name, ts->groupid,
+                               ts->error);
+       /* Log Read Status */
        show_ddir_status_terse(ts, rs, 0);
+       /* Log Write Status */
        show_ddir_status_terse(ts, rs, 1);
 
+       /* CPU Usage */
        if (ts->total_run_time) {
                double runt = (double) ts->total_run_time;
 
@@ -429,22 +440,28 @@ static void show_thread_status_terse(struct thread_stat *ts,
        log_info(";%f%%;%f%%;%lu;%lu;%lu", usr_cpu, sys_cpu, ts->ctx, ts->majf,
                                                                ts->minf);
 
+       /* Calc % distribution of IO depths, usecond, msecond latency */
        stat_calc_dist(ts->io_u_map, ts_total_io_u(ts), io_u_dist);
        stat_calc_lat_u(ts, io_u_lat_u);
        stat_calc_lat_m(ts, io_u_lat_m);
 
+       /* Only show fixed 7 I/O depth levels*/
        log_info(";%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]);
 
+       /* Microsecond latency */
        for (i = 0; i < FIO_IO_U_LAT_U_NR; i++)
                log_info(";%3.2f%%", io_u_lat_u[i]);
+       /* Millisecond latency */
        for (i = 0; i < FIO_IO_U_LAT_M_NR; i++)
                log_info(";%3.2f%%", io_u_lat_m[i]);
+       /* 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)
                log_info(";%s", ts->description);
 
@@ -609,7 +626,7 @@ void show_run_stats(void)
                        ts->io_u_lat_m[k] += td->ts.io_u_lat_m[k];
 
 
-               for (k = 0; k <= DDIR_WRITE; 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];
                }
@@ -733,13 +750,20 @@ static void add_log_sample(struct thread_data *td, struct io_log *iolog,
                           unsigned long val, enum fio_ddir ddir,
                           unsigned int bs)
 {
+       if (!ddir_rw(ddir))
+               return;
+
        __add_log_sample(iolog, val, ddir, bs, mtime_since_now(&td->epoch));
 }
 
 void add_agg_sample(unsigned long val, enum fio_ddir ddir, unsigned int bs)
 {
-       struct io_log *iolog = agg_io_log[ddir];
+       struct io_log *iolog;
+
+       if (!ddir_rw(ddir))
+               return;
 
+       iolog = agg_io_log[ddir];
        __add_log_sample(iolog, val, ddir, bs, mtime_since_genesis());
 }
 
@@ -748,6 +772,9 @@ void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
 {
        struct thread_stat *ts = &td->ts;
 
+       if (!ddir_rw(ddir))
+               return;
+
        add_stat_sample(&ts->clat_stat[ddir], usec);
 
        if (ts->clat_log)
@@ -759,6 +786,9 @@ void add_slat_sample(struct thread_data *td, enum fio_ddir ddir,
 {
        struct thread_stat *ts = &td->ts;
 
+       if (!ddir_rw(ddir))
+               return;
+
        add_stat_sample(&ts->slat_stat[ddir], usec);
 
        if (ts->slat_log)
@@ -770,6 +800,9 @@ void add_lat_sample(struct thread_data *td, enum fio_ddir ddir,
 {
        struct thread_stat *ts = &td->ts;
 
+       if (!ddir_rw(ddir))
+               return;
+
        add_stat_sample(&ts->lat_stat[ddir], usec);
 
        if (ts->lat_log)
@@ -780,9 +813,12 @@ void add_bw_sample(struct thread_data *td, enum fio_ddir ddir, unsigned int bs,
                   struct timeval *t)
 {
        struct thread_stat *ts = &td->ts;
-       unsigned long spent = mtime_since(&ts->stat_sample_time[ddir], t);
-       unsigned long rate;
+       unsigned long spent, rate;
+
+       if (!ddir_rw(ddir))
+               return;
 
+       spent = mtime_since(&ts->stat_sample_time[ddir], t);
        if (spent < td->o.bw_avg_time)
                return;