Default to terse version 3
[fio.git] / stat.c
diff --git a/stat.c b/stat.c
index 5e0fe4369ec2bdb5787e8c29670a3d0a0027a955..4e00177b4530cb155eead4e98d5b6b261870625c 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -259,12 +259,12 @@ static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max,
 void show_group_stats(struct group_run_stats *rs)
 {
        char *p1, *p2, *p3, *p4;
-       const char *ddir_str[] = { "   READ", "  WRITE" };
+       const char *ddir_str[] = { "   READ", "  WRITE" , "   TRIM"};
        int i;
 
-       log_info("Run status group %d (all jobs):\n", rs->groupid);
+       log_info("\nRun status group %d (all jobs):\n", rs->groupid);
 
-       for (i = 0; i <= DDIR_WRITE; i++) {
+       for (i = 0; i < DDIR_RWDIR_CNT; i++) {
                const int i2p = is_power_of_2(rs->kb_base);
 
                if (!rs->max_run[i])
@@ -288,7 +288,8 @@ void show_group_stats(struct group_run_stats *rs)
 }
 
 #define ts_total_io_u(ts)      \
-       ((ts)->total_io_u[0] + (ts)->total_io_u[1])
+       ((ts)->total_io_u[DDIR_READ] + (ts)->total_io_u[DDIR_WRITE] +\
+               (ts)->total_io_u[DDIR_TRIM])
 
 static void stat_calc_dist(unsigned int *map, unsigned long total,
                           double *io_u_dist)
@@ -356,7 +357,7 @@ static int usec_to_msec(unsigned long *min, unsigned long *max, double *mean,
 static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
                             int ddir)
 {
-       const char *ddir_str[] = { "read ", "write" };
+       const char *ddir_str[] = { "read ", "write", "trim" };
        unsigned long min, max, runt;
        unsigned long long bw, iops;
        double mean, dev;
@@ -440,27 +441,42 @@ static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
                                        ts->percentile_list);
        }
        if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
-               double p_of_agg;
+               double p_of_agg = 100.0;
+               const char *bw_str = "KB";
 
-               p_of_agg = mean * 100 / (double) rs->agg[ddir];
-               log_info("     bw (KB/s) : min=%5lu, max=%5lu, per=%3.2f%%,"
-                        " avg=%5.02f, stdev=%5.02f\n", min, max, p_of_agg,
-                                                       mean, dev);
+               if (rs->agg[ddir]) {
+                       p_of_agg = mean * 100 / (double) rs->agg[ddir];
+                       if (p_of_agg > 100.0)
+                               p_of_agg = 100.0;
+               }
+
+               if (mean > 999999.9) {
+                       min /= 1000.0;
+                       max /= 1000.0;
+                       mean /= 1000.0;
+                       dev /= 1000.0;
+                       bw_str = "MB";
+               }
+
+               log_info("    bw (%s/s)  : min=%5lu, max=%5lu, per=%3.2f%%,"
+                        " avg=%5.02f, stdev=%5.02f\n", bw_str, min, max,
+                                                       p_of_agg, mean, dev);
        }
 }
 
-static void show_lat(double *io_u_lat, int nr, const char **ranges,
-                    const char *msg)
+static int show_lat(double *io_u_lat, int nr, const char **ranges,
+                   const char *msg)
 {
-       int new_line = 1, i, line = 0;
+       int new_line = 1, i, line = 0, shown = 0;
 
        for (i = 0; i < nr; i++) {
                if (io_u_lat[i] <= 0.0)
                        continue;
+               shown = 1;
                if (new_line) {
                        if (line)
                                log_info("\n");
-                       log_info("     lat (%s): ", msg);
+                       log_info("    lat (%s) : ", msg);
                        new_line = 0;
                        line = 0;
                }
@@ -471,6 +487,11 @@ static void show_lat(double *io_u_lat, int nr, const char **ranges,
                if (line == 5)
                        new_line = 1;
        }
+
+       if (shown)
+               log_info("\n");
+
+       return shown;
 }
 
 static void show_lat_u(double *io_u_lat_u)
@@ -493,9 +514,7 @@ static void show_lat_m(double *io_u_lat_m)
 static void show_latencies(double *io_u_lat_u, double *io_u_lat_m)
 {
        show_lat_u(io_u_lat_u);
-       log_info("\n");
        show_lat_m(io_u_lat_m);
-       log_info("\n");
 }
 
 void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs)
@@ -505,28 +524,41 @@ void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs)
        double io_u_dist[FIO_IO_U_MAP_NR];
        double io_u_lat_u[FIO_IO_U_LAT_U_NR];
        double io_u_lat_m[FIO_IO_U_LAT_M_NR];
+       time_t time_p;
+       char time_buf[64];
 
-       if (!(ts->io_bytes[0] + ts->io_bytes[1]) &&
-           !(ts->total_io_u[0] + ts->total_io_u[1]))
+       if (!(ts->io_bytes[DDIR_READ] + ts->io_bytes[DDIR_WRITE] +
+           ts->io_bytes[DDIR_TRIM]) && !(ts->total_io_u[DDIR_READ] +
+           ts->total_io_u[DDIR_WRITE] + ts->total_io_u[DDIR_TRIM]))
                return;
 
+       time(&time_p);
+       ctime_r((const time_t *) &time_p, time_buf);
+
        if (!ts->error) {
-               log_info("%s: (groupid=%d, jobs=%d): err=%2d: pid=%d\n",
+               log_info("%s: (groupid=%d, jobs=%d): err=%2d: pid=%d: %s",
                                        ts->name, ts->groupid, ts->members,
-                                       ts->error, (int) ts->pid);
+                                       ts->error, (int) ts->pid, time_buf);
        } else {
-               log_info("%s: (groupid=%d, jobs=%d): err=%2d (%s): pid=%d\n",
+               log_info("%s: (groupid=%d, jobs=%d): err=%2d (%s): pid=%d: %s",
                                        ts->name, ts->groupid, ts->members,
-                                       ts->error, ts->verror, (int) ts->pid);
+                                       ts->error, ts->verror, (int) ts->pid,
+                                       time_buf);
        }
 
-       if (ts->description)
+       if (strlen(ts->description))
                log_info("  Description  : [%s]\n", ts->description);
 
        if (ts->io_bytes[DDIR_READ])
                show_ddir_status(rs, ts, DDIR_READ);
        if (ts->io_bytes[DDIR_WRITE])
                show_ddir_status(rs, ts, DDIR_WRITE);
+       if (ts->io_bytes[DDIR_TRIM])
+               show_ddir_status(rs, ts, DDIR_TRIM);
+
+       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);
 
        runtime = ts->total_run_time;
        if (runtime) {
@@ -561,14 +593,12 @@ void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs)
                                        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/d: total=%lu/%lu/%lu, short=%lu/%lu/%lu\n",
+       log_info("     issued    : total=r=%lu/w=%lu/d=%lu,"
+                                " short=r=%lu/w=%lu/d=%lu\n",
                                        ts->total_io_u[0], ts->total_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);
        if (ts->continue_on_error) {
                log_info("     errors    : total=%lu, first_error=%d/<%s>\n",
                                        ts->total_err_count,
@@ -593,7 +623,7 @@ static void show_ddir_status_terse(struct thread_stat *ts,
        if (ts->runtime[ddir]) {
                uint64_t runt = ts->runtime[ddir];
 
-               bw = ts->io_bytes[ddir] / runt;
+               bw = ((1000 * ts->io_bytes[ddir]) / runt) / 1024;
                iops = (1000 * (uint64_t) ts->total_io_u[ddir]) / runt;
        }
 
@@ -610,11 +640,6 @@ static void show_ddir_status_terse(struct thread_stat *ts,
        else
                log_info(";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
 
-       if (calc_lat(&ts->lat_stat[ddir], &min, &max, &mean, &dev))
-               log_info(";%lu;%lu;%f;%f", min, max, mean, dev);
-       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,
@@ -630,22 +655,91 @@ static void show_ddir_status_terse(struct thread_stat *ts,
                }
                log_info(";%2.2f%%=%u", ts->percentile_list[i].u.f, ovals[i]);
        }
+
+       if (calc_lat(&ts->lat_stat[ddir], &min, &max, &mean, &dev))
+               log_info(";%lu;%lu;%f;%f", min, max, mean, dev);
+       else
+               log_info(";%lu;%lu;%f;%f", 0UL, 0UL, 0.0, 0.0);
+
        if (ovals)
                free(ovals);
 
        if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
-               double p_of_agg;
+               double p_of_agg = 100.0;
+
+               if (rs->agg[ddir]) {
+                       p_of_agg = mean * 100 / (double) rs->agg[ddir];
+                       if (p_of_agg > 100.0)
+                               p_of_agg = 100.0;
+               }
 
-               p_of_agg = mean * 100 / (double) rs->agg[ddir];
                log_info(";%lu;%lu;%f%%;%f;%f", min, max, p_of_agg, mean, dev);
        } else
                log_info(";%lu;%lu;%f%%;%f;%f", 0UL, 0UL, 0.0, 0.0, 0.0);
 }
 
-#define FIO_TERSE_VERSION      "3"
+static void show_thread_status_terse_v2(struct thread_stat *ts,
+                                       struct group_run_stats *rs)
+{
+       double io_u_dist[FIO_IO_U_MAP_NR];
+       double io_u_lat_u[FIO_IO_U_LAT_U_NR];
+       double io_u_lat_m[FIO_IO_U_LAT_M_NR];
+       double usr_cpu, sys_cpu;
+       int i;
 
-static void show_thread_status_terse(struct thread_stat *ts,
-                                    struct group_run_stats *rs)
+       /* General Info */
+       log_info("2;%s;%d;%d", ts->name, ts->groupid, ts->error);
+       /* Log Read Status */
+       show_ddir_status_terse(ts, rs, DDIR_READ);
+       /* Log Write Status */
+       show_ddir_status_terse(ts, rs, DDIR_WRITE);
+       /* Log Trim Status */
+       show_ddir_status_terse(ts, rs, DDIR_TRIM);
+
+       /* CPU Usage */
+       if (ts->total_run_time) {
+               double runt = (double) ts->total_run_time;
+
+               usr_cpu = (double) ts->usr_time * 100 / runt;
+               sys_cpu = (double) ts->sys_time * 100 / runt;
+       } else {
+               usr_cpu = 0;
+               sys_cpu = 0;
+       }
+
+       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);
+
+       log_info("\n");
+}
+
+static void show_thread_status_terse_v3_v4(struct thread_stat *ts,
+                                          struct group_run_stats *rs, int ver)
 {
        double io_u_dist[FIO_IO_U_MAP_NR];
        double io_u_lat_u[FIO_IO_U_LAT_U_NR];
@@ -654,12 +748,15 @@ static void show_thread_status_terse(struct thread_stat *ts,
        int i;
 
        /* General Info */
-       log_info("%s;%s;%d;%d", FIO_TERSE_VERSION, ts->name, ts->groupid,
-                               ts->error);
+       log_info("%s;%s;%s;%d;%d", ver, fio_version_string,
+                                       ts->name, ts->groupid, ts->error);
        /* Log Read Status */
-       show_ddir_status_terse(ts, rs, 0);
+       show_ddir_status_terse(ts, rs, DDIR_READ);
        /* Log Write Status */
-       show_ddir_status_terse(ts, rs, 1);
+       show_ddir_status_terse(ts, rs, DDIR_WRITE);
+       /* Log Trim Status */
+       if (ver == 4)
+               show_ddir_status_terse(ts, rs, DDIR_TRIM);
 
        /* CPU Usage */
        if (ts->total_run_time) {
@@ -698,11 +795,23 @@ static void show_thread_status_terse(struct thread_stat *ts,
        /* 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 (strlen(ts->description))
                log_info(";%s", ts->description);
+
+       log_info("\n");
+}
+
+static void show_thread_status_terse(struct thread_stat *ts,
+                                    struct group_run_stats *rs)
+{
+       if (terse_version == 2)
+               show_thread_status_terse_v2(ts, rs);
+       else if (terse_version == 3 || terse_version == 4)
+               show_thread_status_terse_v3_v4(ts, rs, terse_version);
+       else
+               log_err("fio: bad terse version!? %d\n", terse_version);
 }
 
 static void sum_stat(struct io_stat *dst, struct io_stat *src, int nr)
@@ -744,7 +853,7 @@ void sum_group_stats(struct group_run_stats *dst, struct group_run_stats *src)
 {
        int i;
 
-       for (i = 0; i < 2; i++) {
+       for (i = 0; i < DDIR_RWDIR_CNT; 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])
@@ -764,7 +873,7 @@ void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, int nr)
 {
        int l, k;
 
-       for (l = 0; l <= DDIR_WRITE; l++) {
+       for (l = 0; l < DDIR_RWDIR_CNT; 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);
@@ -793,12 +902,12 @@ void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, int nr)
        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++) {
+       for (k = 0; k < DDIR_RWDIR_CNT; 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++) {
+       for (k = 0; k < DDIR_RWDIR_CNT; 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];
@@ -811,9 +920,11 @@ void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, int nr)
 
 void init_group_run_stat(struct group_run_stats *gs)
 {
+       int i;
        memset(gs, 0, sizeof(*gs));
-       gs->min_bw[0] = gs->min_run[0] = ~0UL;
-       gs->min_bw[1] = gs->min_run[1] = ~0UL;
+
+       for (i = 0; i < DDIR_RWDIR_CNT; i++)
+               gs->min_bw[i] = gs->min_run[i] = ~0UL;
 }
 
 void init_thread_stat(struct thread_stat *ts)
@@ -822,7 +933,7 @@ void init_thread_stat(struct thread_stat *ts)
 
        memset(ts, 0, sizeof(*ts));
 
-       for (j = 0; j <= DDIR_WRITE; j++) {
+       for (j = 0; j < DDIR_RWDIR_CNT; j++) {
                ts->lat_stat[j].min_val = -1UL;
                ts->clat_stat[j].min_val = -1UL;
                ts->slat_stat[j].min_val = -1UL;
@@ -939,7 +1050,7 @@ void show_run_stats(void)
                rs = &runstats[ts->groupid];
                rs->kb_base = ts->kb_base;
 
-               for (j = 0; j <= DDIR_WRITE; j++) {
+               for (j = 0; j < DDIR_RWDIR_CNT; j++) {
                        if (!ts->runtime[j])
                                continue;
                        if (ts->runtime[j] < rs->min_run[j] || !rs->min_run[j])
@@ -949,10 +1060,11 @@ void show_run_stats(void)
 
                        bw = 0;
                        if (ts->runtime[j]) {
-                               unsigned long runt;
+                               unsigned long runt = ts->runtime[j];
+                               unsigned long long kb;
 
-                               runt = ts->runtime[j];
-                               bw = ts->io_bytes[j] / runt;
+                               kb = ts->io_bytes[j] / rs->kb_base;
+                               bw = kb * 1000 / runt;
                        }
                        if (bw < rs->min_bw[j])
                                rs->min_bw[j] = bw;
@@ -964,16 +1076,15 @@ void show_run_stats(void)
        }
 
        for (i = 0; i < groupid + 1; i++) {
-               unsigned long max_run[2];
+               int ddir;
 
                rs = &runstats[i];
-               max_run[0] = rs->max_run[0];
-               max_run[1] = rs->max_run[1];
 
-               if (rs->max_run[0])
-                       rs->agg[0] = (rs->io_kb[0] * 1000) / max_run[0];
-               if (rs->max_run[1])
-                       rs->agg[1] = (rs->io_kb[1] * 1000) / max_run[1];
+               for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {
+                       if (rs->max_run[ddir])
+                               rs->agg[ddir] = (rs->io_kb[ddir] * 1000) /
+                                               rs->max_run[ddir];
+               }
        }
 
        /*
@@ -994,29 +1105,79 @@ void show_run_stats(void)
                        show_thread_status(ts, rs);
        }
 
-       if (!terse_output) {
-               for (i = 0; i < groupid + 1; i++) {
-                       rs = &runstats[i];
-
-                       rs->groupid = i;
-                       if (is_backend)
-                               fio_server_send_gs(rs);
-                       else
-                               show_group_stats(rs);
-               }
+       for (i = 0; i < groupid + 1; i++) {
+               rs = &runstats[i];
 
+               rs->groupid = i;
                if (is_backend)
-                       fio_server_send_du();
-               else
-                       show_disk_util(0);
-
-               free_disk_util();
+                       fio_server_send_gs(rs);
+               else if (!terse_output)
+                       show_group_stats(rs);
        }
 
+       if (is_backend)
+               fio_server_send_du();
+       else if (!terse_output)
+               show_disk_util(0);
+
        free(runstats);
        free(threadstats);
 }
 
+static void *__show_running_run_stats(void *arg)
+{
+       struct thread_data *td;
+       unsigned long long *rt;
+       struct timeval tv;
+       int i;
+
+       rt = malloc(thread_number * sizeof(unsigned long long));
+       fio_gettime(&tv, NULL);
+
+       for_each_td(td, i) {
+               rt[i] = mtime_since(&td->start, &tv);
+               if (td_read(td) && td->io_bytes[DDIR_READ])
+                       td->ts.runtime[DDIR_READ] += rt[i];
+               if (td_write(td) && td->io_bytes[DDIR_WRITE])
+                       td->ts.runtime[DDIR_WRITE] += rt[i];
+               if (td_trim(td) && td->io_bytes[DDIR_TRIM])
+                       td->ts.runtime[DDIR_TRIM] += rt[i];
+
+               update_rusage_stat(td);
+               td->ts.io_bytes[DDIR_READ] = td->io_bytes[DDIR_READ];
+               td->ts.io_bytes[DDIR_WRITE] = td->io_bytes[DDIR_WRITE];
+               td->ts.io_bytes[DDIR_TRIM] = td->io_bytes[DDIR_TRIM];
+               td->ts.total_run_time = mtime_since(&td->epoch, &tv);
+       }
+
+       show_run_stats();
+
+       for_each_td(td, i) {
+               if (td_read(td) && td->io_bytes[DDIR_READ])
+                       td->ts.runtime[DDIR_READ] -= rt[i];
+               if (td_write(td) && td->io_bytes[DDIR_WRITE])
+                       td->ts.runtime[DDIR_WRITE] -= rt[i];
+               if (td_trim(td) && td->io_bytes[DDIR_TRIM])
+                       td->ts.runtime[DDIR_TRIM] -= rt[i];
+       }
+
+       free(rt);
+       return NULL;
+}
+
+/*
+ * Called from signal handler. It _should_ be safe to just run this inline
+ * in the sig handler, but we should be disturbing the system less by just
+ * creating a thread to do it.
+ */
+void show_running_run_stats(void)
+{
+       pthread_t thread;
+
+       pthread_create(&thread, NULL, __show_running_run_stats, NULL);
+       pthread_detach(thread);
+}
+
 static inline void add_stat_sample(struct io_stat *is, unsigned long data)
 {
        double val = data;
@@ -1042,6 +1203,9 @@ static void __add_log_sample(struct io_log *iolog, unsigned long val,
 {
        const int nr_samples = iolog->nr_samples;
 
+       if (!iolog->nr_samples)
+               iolog->avg_last = t;
+
        if (iolog->nr_samples == iolog->max_samples) {
                int new_size = sizeof(struct io_sample) * iolog->max_samples*2;
 
@@ -1056,14 +1220,74 @@ static void __add_log_sample(struct io_log *iolog, unsigned long val,
        iolog->nr_samples++;
 }
 
+static inline void reset_io_stat(struct io_stat *ios)
+{
+       ios->max_val = ios->min_val = ios->samples = 0;
+       ios->mean.u.f = ios->S.u.f = 0;
+}
+
 static void add_log_sample(struct thread_data *td, struct io_log *iolog,
                           unsigned long val, enum fio_ddir ddir,
                           unsigned int bs)
 {
+       unsigned long elapsed, this_window;
+
        if (!ddir_rw(ddir))
                return;
 
-       __add_log_sample(iolog, val, ddir, bs, mtime_since_now(&td->epoch));
+       elapsed = mtime_since_now(&td->epoch);
+
+       /*
+        * If no time averaging, just add the log sample.
+        */
+       if (!iolog->avg_msec) {
+               __add_log_sample(iolog, val, ddir, bs, elapsed);
+               return;
+       }
+
+       /*
+        * Add the sample. If the time period has passed, then
+        * add that entry to the log and clear.
+        */
+       add_stat_sample(&iolog->avg_window[ddir], val);
+
+       /*
+        * If period hasn't passed, adding the above sample is all we
+        * need to do.
+        */
+       this_window = elapsed - iolog->avg_last;
+       if (this_window < iolog->avg_msec)
+               return;
+
+       /*
+        * Note an entry in the log. Use the mean from the logged samples,
+        * making sure to properly round up. Only write a log entry if we
+        * had actual samples done.
+        */
+       if (iolog->avg_window[DDIR_READ].samples) {
+               unsigned long mr;
+
+               mr = iolog->avg_window[DDIR_READ].mean.u.f + 0.50;
+               __add_log_sample(iolog, mr, DDIR_READ, 0, elapsed);
+       }
+       if (iolog->avg_window[DDIR_WRITE].samples) {
+               unsigned long mw;
+
+               mw = iolog->avg_window[DDIR_WRITE].mean.u.f + 0.50;
+               __add_log_sample(iolog, mw, DDIR_WRITE, 0, elapsed);
+       }
+       if (iolog->avg_window[DDIR_TRIM].samples) {
+               unsigned long mw;
+
+               mw = iolog->avg_window[DDIR_TRIM].mean.u.f + 0.50;
+               __add_log_sample(iolog, mw, DDIR_TRIM, 0, elapsed);
+       }
+
+
+       reset_io_stat(&iolog->avg_window[DDIR_READ]);
+       reset_io_stat(&iolog->avg_window[DDIR_WRITE]);
+       reset_io_stat(&iolog->avg_window[DDIR_TRIM]);
+       iolog->avg_last = elapsed;
 }
 
 void add_agg_sample(unsigned long val, enum fio_ddir ddir, unsigned int bs)
@@ -1144,15 +1368,26 @@ void add_bw_sample(struct thread_data *td, enum fio_ddir ddir, unsigned int bs,
        if (spent < td->o.bw_avg_time)
                return;
 
-       rate = (td->this_io_bytes[ddir] - td->stat_io_bytes[ddir]) *
-                       1000 / spent / 1024;
-       add_stat_sample(&ts->bw_stat[ddir], rate);
+       /*
+        * Compute both read and write rates for the interval.
+        */
+       for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
+               uint64_t delta;
+
+               delta = td->this_io_bytes[ddir] - td->stat_io_bytes[ddir];
+               if (!delta)
+                       continue; /* No entries for interval */
+
+               rate = delta * 1000 / spent / 1024;
+               add_stat_sample(&ts->bw_stat[ddir], rate);
+
+               if (td->bw_log)
+                       add_log_sample(td, td->bw_log, rate, ddir, bs);
 
-       if (td->bw_log)
-               add_log_sample(td, td->bw_log, rate, ddir, bs);
+               td->stat_io_bytes[ddir] = td->this_io_bytes[ddir];
+       }
 
        fio_gettime(&td->bw_sample_time, NULL);
-       td->stat_io_bytes[ddir] = td->this_io_bytes[ddir];
 }
 
 void add_iops_sample(struct thread_data *td, enum fio_ddir ddir,
@@ -1168,15 +1403,24 @@ void add_iops_sample(struct thread_data *td, enum fio_ddir ddir,
        if (spent < td->o.iops_avg_time)
                return;
 
-       iops = ((td->this_io_blocks[ddir] - td->stat_io_blocks[ddir]) * 1000) / spent;
+       /*
+        * Compute both read and write rates for the interval.
+        */
+       for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
+               uint64_t delta;
+
+               delta = td->this_io_blocks[ddir] - td->stat_io_blocks[ddir];
+               if (!delta)
+                       continue; /* No entries for interval */
+
+               iops = (delta * 1000) / spent;
+               add_stat_sample(&ts->iops_stat[ddir], iops);
 
-       add_stat_sample(&ts->iops_stat[ddir], iops);
+               if (td->iops_log)
+                       add_log_sample(td, td->iops_log, iops, ddir, 0);
 
-       if (td->iops_log) {
-               assert(iops);
-               add_log_sample(td, td->iops_log, iops, ddir, 0);
+               td->stat_io_blocks[ddir] = td->this_io_blocks[ddir];
        }
 
        fio_gettime(&td->iops_sample_time, NULL);
-       td->stat_io_blocks[ddir] = td->this_io_blocks[ddir];
 }