X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=iolog.h;h=af84e102e65054db60a26bc4ec6b9df121caf259;hp=18d3c6c532fe9b1295c1e8ef33899e603f8f7b31;hb=91f94d5b88b72c300be4f27ef6630e16af890db6;hpb=6a4cf74fc2521b601cb1cc9478526cc441830a5c diff --git a/iolog.h b/iolog.h index 18d3c6c5..af84e102 100644 --- a/iolog.h +++ b/iolog.h @@ -1,8 +1,9 @@ #ifndef FIO_IOLOG_H #define FIO_IOLOG_H -#include "rbtree.h" +#include "lib/rbtree.h" #include "lib/ieee754.h" +#include "flist.h" #include "ioengine.h" /* @@ -52,7 +53,7 @@ struct io_log { * Windowed average, for logging single entries average over some * period of time. */ - struct io_stat avg_window[2]; + struct io_stat avg_window[DDIR_RWDIR_CNT]; unsigned long avg_msec; unsigned long avg_last; }; @@ -119,12 +120,11 @@ extern void add_bw_sample(struct thread_data *, enum fio_ddir, unsigned int, extern void add_iops_sample(struct thread_data *, enum fio_ddir, struct timeval *); extern void init_disk_util(struct thread_data *); extern void update_rusage_stat(struct thread_data *); -extern void update_io_ticks(void); extern void setup_log(struct io_log **, unsigned long, int); extern void finish_log(struct thread_data *, struct io_log *, const char *); extern void finish_log_named(struct thread_data *, struct io_log *, const char *, const char *); extern void __finish_log(struct io_log *, const char *); -extern struct io_log *agg_io_log[2]; +extern struct io_log *agg_io_log[DDIR_RWDIR_CNT]; extern int write_bw_log; extern void add_agg_sample(unsigned long, enum fio_ddir, unsigned int);