Use variable[] instead of GCC variable[0] syntax

[fio.git] / stat.h

diff --git a/stat.h b/stat.h
index 507a76a9689c703883a84d54535671a217c91a91..4ca826170a0b886376f12f7b3591866f6543092d 100644 (file)
--- a/stat.h
+++ b/stat.h
@@ -2,10 +2,10 @@
 #define FIO_STAT_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;
 };
@@ -115,8 +115,8 @@ struct group_run_stats {
 struct thread_stat {
        char name[FIO_JOBNAME_SIZE];
        char verror[FIO_VERROR_SIZE];
-       int32_t error;
-       int32_t groupid;
+       uint32_t error;
+       uint32_t groupid;
        uint32_t pid;
        char description[FIO_JOBNAME_SIZE];
        uint32_t members;
@@ -124,10 +124,11 @@ struct thread_stat {
        /*
         * 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 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
@@ -141,21 +142,21 @@ struct thread_stat {
         * IO depth and latency stats
         */
        uint64_t clat_percentiles;
-       double *percentile_list;
+       fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        uint32_t io_u_map[FIO_IO_U_MAP_NR];
        uint32_t io_u_submit[FIO_IO_U_MAP_NR];
        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;
 
        /*
@@ -163,13 +164,40 @@ struct thread_stat {
         */
        uint16_t continue_on_error;
        uint64_t total_err_count;
-       int32_t first_error;
+       uint32_t first_error;
 
        uint32_t kb_base;
 };
 
+struct jobs_eta {
+       uint32_t nr_running;
+       uint32_t nr_ramp;
+       uint32_t nr_pending;
+       uint32_t files_open;
+       uint32_t m_rate, t_rate;
+       uint32_t m_iops, t_iops;
+       uint32_t rate[DDIR_RWDIR_CNT];
+       uint32_t iops[DDIR_RWDIR_CNT];
+       uint64_t elapsed_sec;
+       uint64_t eta_sec;
+       uint32_t is_pow2;
+
+       /*
+        * Network 'copy' of run_str[]
+        */
+       uint32_t nr_threads;
+       uint8_t run_str[];
+};
+
 extern void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs);
 extern void show_group_stats(struct group_run_stats *rs);
-
+extern int calc_thread_status(struct jobs_eta *je, int force);
+extern void display_thread_status(struct jobs_eta *je);
+extern void show_run_stats(void);
+extern void show_running_run_stats(void);
+extern void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, int nr);
+extern void sum_group_stats(struct group_run_stats *dst, struct group_run_stats *src);
+extern void init_thread_stat(struct thread_stat *ts);
+extern void init_group_run_stat(struct group_run_stats *gs);
 
 #endif