Start and stop status interval (or file) thread separately

[fio.git] / stat.h

diff --git a/stat.h b/stat.h
index 8a1536e889b633593f2dabcfe439b9046e8fb42a..2c68edcc4513fc40bd7f0e9f37daa5a8dd3d6d98 100644 (file)
--- a/stat.h
+++ b/stat.h
@@ -9,8 +9,10 @@ struct group_run_stats {
        uint64_t io_kb[DDIR_RWDIR_CNT];
        uint64_t agg[DDIR_RWDIR_CNT];
        uint32_t kb_base;
+       uint32_t unit_base;
        uint32_t groupid;
-};
+       uint32_t unified_rw_rep;
+} __attribute__((packed));
 
 /*
  * How many depth levels to log
@@ -112,6 +114,7 @@ struct group_run_stats {
 
 #define MAX_PATTERN_SIZE       512
 #define FIO_JOBNAME_SIZE       128
+#define FIO_JOBDESC_SIZE       256
 #define FIO_VERROR_SIZE                128
 
 struct thread_stat {
@@ -121,8 +124,9 @@ struct thread_stat {
        uint32_t thread_number;
        uint32_t groupid;
        uint32_t pid;
-       char description[FIO_JOBNAME_SIZE];
+       char description[FIO_JOBDESC_SIZE];
        uint32_t members;
+       uint32_t unified_rw_rep;
 
        /*
         * bandwidth and latency stats
@@ -145,6 +149,7 @@ struct thread_stat {
         * IO depth and latency stats
         */
        uint64_t clat_percentiles;
+       uint64_t percentile_precision;
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
        uint32_t io_u_map[FIO_IO_U_MAP_NR];
@@ -155,6 +160,7 @@ struct thread_stat {
        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 drop_io_u[3];
        uint64_t total_submit;
        uint64_t total_complete;
 
@@ -170,13 +176,24 @@ struct thread_stat {
        uint32_t first_error;
 
        uint32_t kb_base;
-};
+       uint32_t unit_base;
+
+       uint32_t latency_depth;
+       uint64_t latency_target;
+       uint16_t pad;
+       fio_fp64_t latency_percentile;
+       uint64_t latency_window;
+} __attribute__((packed));
 
 struct jobs_eta {
        uint32_t nr_running;
        uint32_t nr_ramp;
+
        uint32_t nr_pending;
+       uint32_t nr_setting_up;
+
        uint32_t files_open;
+
        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];
@@ -184,20 +201,28 @@ struct jobs_eta {
        uint64_t elapsed_sec;
        uint64_t eta_sec;
        uint32_t is_pow2;
+       uint32_t unit_base;
 
        /*
         * Network 'copy' of run_str[]
         */
        uint32_t nr_threads;
-       uint8_t run_str[0];
-};
+       uint8_t run_str[];
+} __attribute__((packed));
 
-extern void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs);
+extern struct jobs_eta *get_jobs_eta(int force, size_t *size);
+
+extern void stat_init(void);
+extern void stat_exit(void);
+
+extern struct json_object * 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_run_stats(void);
 extern void show_running_run_stats(void);
+extern void check_for_running_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);
@@ -208,6 +233,9 @@ extern unsigned int calc_clat_percentiles(unsigned int *io_u_plat, unsigned long
 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);
+extern void reset_io_stats(struct thread_data *);
+extern void create_status_interval_thread(void);
+extern void wait_for_status_interval_thread_exit(void);
 
 static inline int usec_to_msec(unsigned long *min, unsigned long *max,
                               double *mean, double *dev)
@@ -222,5 +250,10 @@ static inline int usec_to_msec(unsigned long *min, unsigned long *max,
 
        return 1;
 }
+/*
+ * Worst level condensing would be 1:5, so allow enough room for that
+ */
+#define __THREAD_RUNSTR_SZ(nr) ((nr) * 5)
+#define THREAD_RUNSTR_SZ       __THREAD_RUNSTR_SZ(thread_number)
 
 #endif