Improve latency_target runs

[fio.git] / stat.h

diff --git a/stat.h b/stat.h
index f23abfabac9e39d23eb8c5417670c81f4217de92..bc4f6da483663a2d84921083863c29f4fa92c313 100644 (file)
--- a/stat.h
+++ b/stat.h
@@ -1,6 +1,8 @@
 #ifndef FIO_STAT_H
 #define FIO_STAT_H
 
+#include "iolog.h"
+
 struct group_run_stats {
        uint64_t max_run[DDIR_RWDIR_CNT], min_run[DDIR_RWDIR_CNT];
        uint64_t max_bw[DDIR_RWDIR_CNT], min_bw[DDIR_RWDIR_CNT];
@@ -118,6 +120,7 @@ struct thread_stat {
        char name[FIO_JOBNAME_SIZE];
        char verror[FIO_VERROR_SIZE];
        uint32_t error;
+       uint32_t thread_number;
        uint32_t groupid;
        uint32_t pid;
        char description[FIO_JOBNAME_SIZE];
@@ -172,15 +175,21 @@ struct thread_stat {
 
        uint32_t kb_base;
        uint32_t unit_base;
+
+       uint32_t latency_depth;
+       uint64_t latency_target;
+       fio_fp64_t latency_percentile;
+       uint64_t latency_window;
 };
 
 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, t_rate;
-       uint32_t m_iops, t_iops;
+       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;
@@ -195,15 +204,40 @@ struct jobs_eta {
        uint8_t run_str[];
 };
 
-extern void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs);
+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_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);
 extern void init_group_run_stat(struct group_run_stats *gs);
+extern void eta_to_str(char *str, unsigned long eta_sec);
+extern int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max, double *mean, double *dev);
+extern unsigned int calc_clat_percentiles(unsigned int *io_u_plat, unsigned long nr, fio_fp64_t *plist, unsigned int **output, unsigned int *maxv, unsigned int *minv);
+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 *);
+
+static inline int usec_to_msec(unsigned long *min, unsigned long *max,
+                              double *mean, double *dev)
+{
+       if (*min > 1000 && *max > 1000 && *mean > 1000.0 && *dev > 1000.0) {
+               *min /= 1000;
+               *max /= 1000;
+               *mean /= 1000.0;
+               *dev /= 1000.0;
+               return 0;
+       }
+
+       return 1;
+}
 
 #endif