Improve random verify block sorting

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 6e9311be9517347892e1adc4dd8037f57676c31d..ddc7e2397808743cd34e3220664f73ed74eba9c7 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -14,6 +14,7 @@
 #include <getopt.h>
 
 #include "list.h"
+#include "rbtree.h"
 #include "md5.h"
 #include "crc32.h"
 #include "arch.h"
@@ -24,6 +25,10 @@
 #include "syslet.h"
 #endif
 
+#ifdef FIO_HAVE_GUASI
+#include <guasi.h>
+#endif
+
 enum fio_ddir {
        DDIR_READ = 0,
        DDIR_WRITE,
@@ -74,7 +79,10 @@ struct io_log {
  * When logging io actions, this matches a single sent io_u
  */
 struct io_piece {
-       struct list_head list;
+       union {
+               struct rb_node rb_node;
+               struct list_head list;
+       };
        struct fio_file *file;
        unsigned long long offset;
        unsigned long len;
@@ -94,6 +102,8 @@ enum {
        IO_U_F_FLIGHT   = 1 << 1,
 };
 
+struct thread_data;
+
 /*
  * The io unit
  */
@@ -110,6 +120,9 @@ struct io_u {
 #endif
 #ifdef FIO_HAVE_SYSLET
                struct syslet_req req;
+#endif
+#ifdef FIO_HAVE_GUASI
+               guasi_req_t greq;
 #endif
        };
        struct timeval start_time;
@@ -151,7 +164,7 @@ struct io_u {
        /*
         * Callback for io completion
         */
-       int (*end_io)(struct io_u *);
+       int (*end_io)(struct thread_data *, struct io_u *);
 };
 
 /*
@@ -169,6 +182,7 @@ enum {
        VERIFY_NONE = 0,                /* no verification */
        VERIFY_MD5,                     /* md5 sum data blocks */
        VERIFY_CRC32,                   /* crc32 sum data blocks */
+       VERIFY_NULL,                    /* pretend to verify */
 };
 
 /*
@@ -224,6 +238,7 @@ enum fio_file_flags {
        FIO_FILE_UNLINK         = 1 << 1,       /* unlink on close */
        FIO_FILE_CLOSING        = 1 << 2,       /* file being closed */
        FIO_FILE_EXISTS         = 1 << 3,       /* no need to create */
+       FIO_FILE_NOSORT         = 1 << 4,       /* don't sort verify blocks */
 };
 
 /*
@@ -318,6 +333,7 @@ struct thread_options {
        char *opendir;
        char *ioengine;
        enum td_ddir td_ddir;
+       unsigned int ddir_nr;
        unsigned int iodepth;
        unsigned int iodepth_low;
        unsigned int iodepth_batch;
@@ -341,6 +357,7 @@ struct thread_options {
        unsigned int end_fsync;
        unsigned int sync_io;
        unsigned int verify;
+       unsigned int verifysort;
        unsigned int use_thread;
        unsigned int unlink;
        unsigned int do_disk_util;
@@ -368,16 +385,17 @@ struct thread_options {
        enum fio_memtype mem_type;
 
        unsigned int stonewall;
+       unsigned int new_group;
        unsigned int numjobs;
        os_cpu_mask_t cpumask;
        unsigned int iolog;
        unsigned int read_iolog;
        unsigned int rwmixcycle;
-       unsigned int rwmixread;
-       unsigned int rwmixwrite;
+       unsigned int rwmix[2];
        unsigned int nice;
        unsigned int file_service_type;
        unsigned int group_reporting;
+       unsigned int fadvise_hint;
 
        char *read_iolog_file;
        char *write_iolog_file;
@@ -403,12 +421,14 @@ struct thread_options {
        unsigned int cpucycle;
 };
 
+#define FIO_VERROR_SIZE        128
+
 /*
  * This describes a single thread/process executing a fio job.
  */
 struct thread_data {
        struct thread_options o;
-       char verror[128];
+       char verror[FIO_VERROR_SIZE];
        pthread_t thread;
        int thread_number;
        int groupid;
@@ -484,18 +504,28 @@ struct thread_data {
 
        struct timeval start;   /* start of this loop */
        struct timeval epoch;   /* time job was started */
+       struct timeval rw_end[2];
+       unsigned int rw_end_set[2];
 
        /*
         * read/write mixed workload state
         */
        os_random_state_t rwmix_state;
+       unsigned long long rwmix_bytes;
        struct timeval rwmix_switch;
        enum fio_ddir rwmix_ddir;
+       unsigned int ddir_nr;
 
        /*
-        * IO historic logs
+        * IO history logs for verification. We use a tree for sorting,
+        * if we are overwriting. Otherwise just use a fifo.
         */
+       struct rb_root io_hist_tree;
        struct list_head io_hist_list;
+
+       /*
+        * For IO replaying
+        */
        struct list_head io_log_list;
 
        /*
@@ -676,6 +706,8 @@ extern int fio_cmd_option_parse(struct thread_data *, const char *, char *);
 extern void fio_fill_default_options(struct thread_data *);
 extern int fio_show_option_help(const char *);
 extern void fio_options_dup_and_init(struct option *);
+extern void options_mem_dupe(struct thread_data *);
+extern void options_mem_free(struct thread_data *);
 #define FIO_GETOPT_JOB         0x89988998
 #define FIO_NR_OPTIONS         128
 
@@ -693,6 +725,7 @@ extern void get_file(struct fio_file *);
 extern void put_file(struct thread_data *, struct fio_file *);
 extern int add_dir_files(struct thread_data *, const char *);
 extern int init_random_map(struct thread_data *);
+extern void dup_files(struct thread_data *, struct thread_data *);
 
 /*
  * ETA/status stuff
@@ -722,7 +755,7 @@ enum {
  */
 extern void populate_verify_io_u(struct thread_data *, struct io_u *);
 extern int __must_check get_next_verify(struct thread_data *td, struct io_u *);
-extern int __must_check verify_io_u(struct io_u *);
+extern int __must_check verify_io_u(struct thread_data *, struct io_u *);
 
 /*
  * Memory helpers