[PATCH] Fix random_map

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 015af8db476a5121a485bcfd349cb4efee1e1ec6..6a68ec8dc674b0af8b074faba0627ef9940e82ab 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -63,17 +63,23 @@ struct io_u {
        struct timeval start_time;
        struct timeval issue_time;
 
-       char *buf;
+       void *buf;
        unsigned int buflen;
        unsigned long long offset;
-       unsigned int index;
 
        unsigned int resid;
        unsigned int error;
 
-       unsigned char seen;
        unsigned char ddir;
 
+       /*
+        * io engine private data
+        */
+       union {
+               unsigned int index;
+               unsigned int seen;
+       };
+
        struct fio_file *file;
 
        struct list_head list;
@@ -107,6 +113,7 @@ struct group_run_stats {
 enum fio_ddir {
        DDIR_READ = 0,
        DDIR_WRITE,
+       DDIR_SYNC,
 };
 
 /*
@@ -151,15 +158,13 @@ struct fio_file {
 
        unsigned long *file_map;
        unsigned int num_maps;
-
-       int fileno;
 };
 
 /*
  * This describes a single thread/process executing a fio job.
  */
 struct thread_data {
-       char name[32];
+       char *name;
        char *directory;
        char *filename;
        char verror[80];
@@ -180,22 +185,25 @@ struct thread_data {
        enum fio_ddir ddir;
        unsigned int iomix;
        unsigned int ioprio;
-
-       unsigned char sequential;
-       unsigned char odirect;
-       unsigned char invalidate_cache;
-       unsigned char create_serialize;
-       unsigned char create_fsync;
-       unsigned char end_fsync;
-       unsigned char sync_io;
-       unsigned char verify;
-       unsigned char use_thread;
-       unsigned char unlink;
-       unsigned char do_disk_util;
-       unsigned char override_sync;
-       unsigned char rand_repeatable;
-       unsigned char write_lat_log;
-       unsigned char write_bw_log;
+       unsigned int last_was_sync;
+
+       unsigned int sequential;
+       unsigned int odirect;
+       unsigned int invalidate_cache;
+       unsigned int create_serialize;
+       unsigned int create_fsync;
+       unsigned int end_fsync;
+       unsigned int sync_io;
+       unsigned int verify;
+       unsigned int use_thread;
+       unsigned int unlink;
+       unsigned int do_disk_util;
+       unsigned int override_sync;
+       unsigned int rand_repeatable;
+       unsigned int write_lat_log;
+       unsigned int write_bw_log;
+       unsigned int norandommap;
+       unsigned int bs_unaligned;
 
        unsigned int bs;
        unsigned int min_bs;
@@ -216,12 +224,13 @@ struct thread_data {
        os_cpu_mask_t cpumask;
        unsigned int iolog;
        unsigned int read_iolog;
-       unsigned int write_iolog;
        unsigned int rwmixcycle;
        unsigned int rwmixread;
+       unsigned int rwmixwrite;
        unsigned int nice;
 
-       char *iolog_file;
+       char *read_iolog_file;
+       char *write_iolog_file;
        void *iolog_buf;
        FILE *iolog_f;
 
@@ -361,6 +370,18 @@ extern struct thread_data *threads;
 
 #define MAX_JOBS       (1024)
 
+static inline int should_fsync(struct thread_data *td)
+{
+       if (td->last_was_sync)
+               return 0;
+       if (td->odirect)
+               return 0;
+       if (td_write(td) || td_rw(td) || td->override_sync)
+               return 1;
+
+       return 0;
+}
+
 struct disk_util_stat {
        unsigned ios[2];
        unsigned merges[2];
@@ -550,14 +571,13 @@ struct ioengine_ops {
        struct io_u *(*event)(struct thread_data *, int);
        int (*cancel)(struct thread_data *, struct io_u *);
        void (*cleanup)(struct thread_data *);
-       int (*sync)(struct thread_data *, struct fio_file *);
        void *data;
        void *dlhandle;
 };
 
-#define FIO_IOOPS_VERSION      2
+#define FIO_IOOPS_VERSION      3
 
-extern struct ioengine_ops *load_ioengine(struct thread_data *, char *);
+extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
 extern void close_ioengine(struct thread_data *);
 
 /*