Make histogram samples non-cumulative by tracking a linked-list

[fio.git] / stat.h

diff --git a/stat.h b/stat.h
index 9595e59ecef31c8c5207b0c418489ba242076feb..f551edc1a5edaa408c6e932136f8eec66c52ecf2 100644 (file)
--- a/stat.h
+++ b/stat.h
@@ -2,6 +2,7 @@
 #define FIO_STAT_H
 
 #include "iolog.h"
+#include "lib/output_buffer.h"
 
 struct group_run_stats {
        uint64_t max_run[DDIR_RWDIR_CNT], min_run[DDIR_RWDIR_CNT];
@@ -112,6 +113,28 @@ struct group_run_stats {
 #define FIO_IO_U_LIST_MAX_LEN 20 /* The size of the default and user-specified
                                        list of percentiles */
 
+/*
+ * Trim cycle count measurements
+ */
+#define MAX_NR_BLOCK_INFOS     8192
+#define BLOCK_INFO_STATE_SHIFT 29
+#define BLOCK_INFO_TRIMS(block_info)   \
+       ((block_info) & ((1 << BLOCK_INFO_STATE_SHIFT) - 1))
+#define BLOCK_INFO_STATE(block_info)           \
+       ((block_info) >> BLOCK_INFO_STATE_SHIFT)
+#define BLOCK_INFO(state, trim_cycles) \
+       ((trim_cycles) | ((state) << BLOCK_INFO_STATE_SHIFT))
+#define BLOCK_INFO_SET_STATE(block_info, state)        \
+       BLOCK_INFO(state, BLOCK_INFO_TRIMS(block_info))
+enum block_info_state {
+       BLOCK_STATE_UNINIT,
+       BLOCK_STATE_TRIMMED,
+       BLOCK_STATE_WRITTEN,
+       BLOCK_STATE_TRIM_FAILURE,
+       BLOCK_STATE_WRITE_FAILURE,
+       BLOCK_STATE_COUNT,
+};
+
 #define MAX_PATTERN_SIZE       512
 #define FIO_JOBNAME_SIZE       128
 #define FIO_JOBDESC_SIZE       256
@@ -158,9 +181,11 @@ struct thread_stat {
        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[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];
+       uint32_t pad;
+
+       uint64_t total_io_u[DDIR_RWDIR_CNT];
+       uint64_t short_io_u[DDIR_RWDIR_CNT];
+       uint64_t drop_io_u[DDIR_RWDIR_CNT];
        uint64_t total_submit;
        uint64_t total_complete;
 
@@ -171,17 +196,21 @@ struct thread_stat {
        /*
         * IO Error related stats
         */
-       uint16_t continue_on_error;
-       uint16_t filler[3];
+       union {
+               uint16_t continue_on_error;
+               uint64_t pad2;
+       };
        uint64_t total_err_count;
        uint32_t first_error;
 
+       uint64_t nr_block_infos;
+       uint32_t block_infos[MAX_NR_BLOCK_INFOS];
+
        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));
@@ -211,13 +240,20 @@ struct jobs_eta {
        uint8_t run_str[];
 } __attribute__((packed));
 
-extern struct jobs_eta *get_jobs_eta(int force, size_t *size);
+struct io_u_plat_entry {
+       struct flist_head list;
+       unsigned int io_u_plat[FIO_IO_U_PLAT_NR];
+};
+
+extern struct fio_mutex *stat_mutex;
+
+extern struct jobs_eta *get_jobs_eta(bool 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 struct json_object * show_thread_status(struct thread_stat *ts, struct group_run_stats *rs, struct flist_head *, struct buf_output *);
+extern void show_group_stats(struct group_run_stats *rs, struct buf_output *);
 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);
@@ -225,7 +261,7 @@ extern void __show_run_stats(void);
 extern void __show_running_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_thread_stats(struct thread_stat *dst, struct thread_stat *src, bool first);
 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);
@@ -236,6 +272,24 @@ 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 update_rusage_stat(struct thread_data *);
+extern void clear_rusage_stat(struct thread_data *);
+
+extern void add_lat_sample(struct thread_data *, enum fio_ddir, unsigned long,
+                               unsigned int, uint64_t);
+extern void add_clat_sample(struct thread_data *, enum fio_ddir, unsigned long,
+                               unsigned int, uint64_t);
+extern void add_slat_sample(struct thread_data *, enum fio_ddir, unsigned long,
+                               unsigned int, uint64_t);
+extern void add_agg_sample(unsigned long, enum fio_ddir, unsigned int);
+extern void add_iops_sample(struct thread_data *, struct io_u *,
+                               unsigned int);
+extern void add_bw_sample(struct thread_data *, struct io_u *,
+                               unsigned int, unsigned long);
+extern int calc_log_samples(void);
+
+extern struct io_log *agg_io_log[DDIR_RWDIR_CNT];
+extern int write_bw_log;
 
 static inline int usec_to_msec(unsigned long *min, unsigned long *max,
                               double *mean, double *dev)
@@ -256,4 +310,6 @@ static inline int usec_to_msec(unsigned long *min, unsigned long *max,
 #define __THREAD_RUNSTR_SZ(nr) ((nr) * 5)
 #define THREAD_RUNSTR_SZ       __THREAD_RUNSTR_SZ(thread_number)
 
+uint32_t *io_u_block_info(struct thread_data *td, struct io_u *io_u);
+
 #endif