Merge branch 'master' into gfio

[fio.git] / stat.h

diff --git a/stat.h b/stat.h
index d7184aabe36aa3ae47674a189d7e53e1b0459923..ba4c2bf2e3af0d844b9fd554cc280c4e8145a238 100644 (file)
--- a/stat.h
+++ b/stat.h
@@ -4,12 +4,13 @@
 #include "iolog.h"
 
 struct group_run_stats {
-       uint64_t max_run[2], min_run[2];
-       uint64_t max_bw[2], min_bw[2];
-       uint64_t io_kb[2];
-       uint64_t agg[2];
+       uint64_t max_run[DDIR_RWDIR_CNT], min_run[DDIR_RWDIR_CNT];
+       uint64_t max_bw[DDIR_RWDIR_CNT], min_bw[DDIR_RWDIR_CNT];
+       uint64_t io_kb[DDIR_RWDIR_CNT];
+       uint64_t agg[DDIR_RWDIR_CNT];
        uint32_t kb_base;
        uint32_t groupid;
+       uint32_t unified_rw_rep;
 };
 
 /*
@@ -123,15 +124,16 @@ struct thread_stat {
        uint32_t pid;
        char description[FIO_JOBNAME_SIZE];
        uint32_t members;
+       uint32_t unified_rw_rep;
 
        /*
         * bandwidth and latency stats
         */
-       struct io_stat clat_stat[2];            /* completion latency */
-       struct io_stat slat_stat[2];            /* submission latency */
-       struct io_stat lat_stat[2];             /* total latency */
-       struct io_stat bw_stat[2];              /* bandwidth stats */
-       struct io_stat iops_stat[2];            /* IOPS stats */
+       struct io_stat clat_stat[DDIR_RWDIR_CNT]; /* completion latency */
+       struct io_stat slat_stat[DDIR_RWDIR_CNT]; /* submission latency */
+       struct io_stat lat_stat[DDIR_RWDIR_CNT]; /* total latency */
+       struct io_stat bw_stat[DDIR_RWDIR_CNT]; /* bandwidth stats */
+       struct io_stat iops_stat[DDIR_RWDIR_CNT]; /* IOPS stats */
 
        /*
         * fio system usage accounting
@@ -152,14 +154,14 @@ struct thread_stat {
        uint32_t io_u_complete[FIO_IO_U_MAP_NR];
        uint32_t io_u_lat_u[FIO_IO_U_LAT_U_NR];
        uint32_t io_u_lat_m[FIO_IO_U_LAT_M_NR];
-       uint32_t io_u_plat[2][FIO_IO_U_PLAT_NR];
+       uint32_t io_u_plat[DDIR_RWDIR_CNT][FIO_IO_U_PLAT_NR];
        uint64_t total_io_u[3];
        uint64_t short_io_u[3];
        uint64_t total_submit;
        uint64_t total_complete;
 
-       uint64_t io_bytes[2];
-       uint64_t runtime[2];
+       uint64_t io_bytes[DDIR_RWDIR_CNT];
+       uint64_t runtime[DDIR_RWDIR_CNT];
        uint64_t total_run_time;
 
        /*
@@ -177,10 +179,10 @@ struct jobs_eta {
        uint32_t nr_ramp;
        uint32_t nr_pending;
        uint32_t files_open;
-       uint32_t m_rate[2], t_rate[2];
-       uint32_t m_iops[2], t_iops[2];
-       uint32_t rate[2];
-       uint32_t iops[2];
+       uint32_t m_rate[DDIR_RWDIR_CNT], t_rate[DDIR_RWDIR_CNT];
+       uint32_t m_iops[DDIR_RWDIR_CNT], t_iops[DDIR_RWDIR_CNT];
+       uint32_t rate[DDIR_RWDIR_CNT];
+       uint32_t iops[DDIR_RWDIR_CNT];
        uint64_t elapsed_sec;
        uint64_t eta_sec;
        uint32_t is_pow2;
@@ -189,7 +191,7 @@ struct jobs_eta {
         * Network 'copy' of run_str[]
         */
        uint32_t nr_threads;
-       uint8_t run_str[0];
+       uint8_t run_str[];
 };
 
 extern void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs);
@@ -209,8 +211,6 @@ extern void stat_calc_lat_m(struct thread_stat *ts, double *io_u_lat);
 extern void stat_calc_lat_u(struct thread_stat *ts, double *io_u_lat);
 extern void stat_calc_dist(unsigned int *map, unsigned long total, double *io_u_dist);
 
-#define ts_total_io_u(ts)      ((ts)->total_io_u[0] + (ts)->total_io_u[1])
-
 static inline int usec_to_msec(unsigned long *min, unsigned long *max,
                               double *mean, double *dev)
 {