verify: always log IO in the order they are issued

[fio.git] / iolog.h

diff --git a/iolog.h b/iolog.h
index a523d4d22767ec8cd80cd022d9ba96dad3e4c012..3ec48f2100fe04f1cc8981a81d61e0d60fb3f9ea 100644 (file)
--- a/iolog.h
+++ b/iolog.h
@@ -1,7 +1,10 @@
 #ifndef FIO_IOLOG_H
 #define FIO_IOLOG_H
 
-#include "ieee754.h"
+#include "lib/rbtree.h"
+#include "lib/ieee754.h"
+#include "flist.h"
+#include "ioengine.h"
 
 /*
  * Use for maintaining statistics
@@ -19,25 +22,52 @@ struct io_stat {
  * A single data sample
  */
 struct io_sample {
-       unsigned long time;
-       unsigned long val;
-       enum fio_ddir ddir;
-       unsigned int bs;
+       uint64_t time;
+       uint64_t val;
+       uint32_t ddir;
+       uint32_t bs;
+};
+
+enum {
+       IO_LOG_TYPE_LAT = 1,
+       IO_LOG_TYPE_CLAT,
+       IO_LOG_TYPE_SLAT,
+       IO_LOG_TYPE_BW,
+       IO_LOG_TYPE_IOPS,
 };
 
 /*
  * Dynamically growing data sample log
  */
 struct io_log {
+       /*
+        * Entries already logged
+        */
        unsigned long nr_samples;
        unsigned long max_samples;
        struct io_sample *log;
+
+       unsigned int log_type;
+
+       /*
+        * If we fail extending the log, stop collecting more entries.
+        */
+       unsigned int disabled;
+
+       /*
+        * Windowed average, for logging single entries average over some
+        * period of time.
+        */
+       struct io_stat avg_window[DDIR_RWDIR_CNT];
+       unsigned long avg_msec;
+       unsigned long avg_last;
 };
 
 enum {
        IP_F_ONRB       = 1,
        IP_F_ONLIST     = 2,
        IP_F_TRIMMED    = 4,
+       IP_F_IN_FLIGHT  = 8,
 };
 
 /*
@@ -54,6 +84,7 @@ struct io_piece {
                struct fio_file *file;
        };
        unsigned long long offset;
+       unsigned short numberio;
        unsigned long len;
        unsigned int flags;
        enum fio_ddir ddir;
@@ -73,6 +104,7 @@ enum file_log_act {
        FIO_LOG_UNLINK_FILE,
 };
 
+struct io_u;
 extern int __must_check read_iolog_get(struct thread_data *, struct io_u *);
 extern void log_io_u(struct thread_data *, struct io_u *);
 extern void log_file(struct thread_data *, struct fio_file *, enum file_log_act);
@@ -93,15 +125,15 @@ extern void add_slat_sample(struct thread_data *, enum fio_ddir, unsigned long,
                                unsigned int);
 extern void add_bw_sample(struct thread_data *, enum fio_ddir, unsigned int,
                                struct timeval *);
-extern void add_iops_sample(struct thread_data *, enum fio_ddir, struct timeval *);
+extern void add_iops_sample(struct thread_data *, enum fio_ddir, unsigned int,
+                               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 **);
+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);