Add option priorities

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index b8847a5cbb3d39553b3fa6492c6bdf6a90dd0bed..ff4668e80f3a0d884e53cd4270c35b5813f9db58 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -16,7 +16,7 @@
 #include <assert.h>
 
 #include "compiler/compiler.h"
-#include "list.h"
+#include "flist.h"
 #include "fifo.h"
 #include "rbtree.h"
 #include "arch/arch.h"
@@ -29,6 +29,10 @@
 #include <guasi.h>
 #endif
 
+#ifdef FIO_HAVE_SOLARISAIO
+#include <sys/asynch.h>
+#endif
+
 enum fio_ddir {
        DDIR_READ = 0,
        DDIR_WRITE,
@@ -88,7 +92,7 @@ struct io_log {
 struct io_piece {
        union {
                struct rb_node rb_node;
-               struct list_head list;
+               struct flist_head list;
        };
        union {
                int fileno;
@@ -126,6 +130,9 @@ struct io_u {
 #endif
 #ifdef FIO_HAVE_GUASI
                guasi_req_t greq;
+#endif
+#ifdef FIO_HAVE_SOLARISAIO
+               aio_result_t resultp;
 #endif
        };
        struct timeval start_time;
@@ -157,13 +164,14 @@ struct io_u {
        union {
                unsigned int index;
                unsigned int seen;
+               void *engine_data;
        };
 
        unsigned int flags;
 
        struct fio_file *file;
 
-       struct list_head list;
+       struct flist_head list;
 
        /*
         * Callback for io completion
@@ -288,7 +296,7 @@ enum fio_file_flags {
  * this structure holds state information for a single file.
  */
 struct fio_file {
-       struct list_head hash_list;
+       struct flist_head hash_list;
        enum fio_filetype filetype;
 
        /*
@@ -326,7 +334,7 @@ struct fio_file {
        /*
         * block map for random io
         */
-       unsigned long *file_map;
+       unsigned int *file_map;
        unsigned int num_maps;
        unsigned int last_free_lookup;
 
@@ -410,6 +418,7 @@ struct thread_options {
        unsigned int iodepth;
        unsigned int iodepth_low;
        unsigned int iodepth_batch;
+       unsigned int iodepth_batch_complete;
 
        unsigned long long size;
        unsigned int fill_device;
@@ -565,9 +574,9 @@ struct thread_data {
         */
        unsigned int cur_depth;
        unsigned int io_u_queued;
-       struct list_head io_u_freelist;
-       struct list_head io_u_busylist;
-       struct list_head io_u_requeues;
+       struct flist_head io_u_freelist;
+       struct flist_head io_u_busylist;
+       struct flist_head io_u_requeues;
 
        /*
         * Rate state
@@ -612,12 +621,12 @@ struct thread_data {
         * if we are overwriting. Otherwise just use a fifo.
         */
        struct rb_root io_hist_tree;
-       struct list_head io_hist_list;
+       struct flist_head io_hist_list;
 
        /*
         * For IO replaying
         */
-       struct list_head io_log_list;
+       struct flist_head io_log_list;
 
        /*
         * timeout handling
@@ -704,7 +713,7 @@ static inline void fio_ro_check(struct thread_data *td, struct io_u *io_u)
        assert(!(io_u->ddir == DDIR_WRITE && !td_write(td)));
 }
 
-#define BLOCKS_PER_MAP         (8 * sizeof(long))
+#define BLOCKS_PER_MAP         (8 * sizeof(int))
 #define TO_MAP_BLOCK(f, b)     (b)
 #define RAND_MAP_IDX(f, b)     (TO_MAP_BLOCK(f, b) / BLOCKS_PER_MAP)
 #define RAND_MAP_BIT(f, b)     (TO_MAP_BLOCK(f, b) & (BLOCKS_PER_MAP - 1))
@@ -739,7 +748,7 @@ struct disk_util_stat {
  * Per-device disk util management
  */
 struct disk_util {
-       struct list_head list;
+       struct flist_head list;
 
        char *name;
        char *sysfs_root;
@@ -784,7 +793,6 @@ extern void show_run_stats(void);
 extern void init_disk_util(struct thread_data *);
 extern void update_rusage_stat(struct thread_data *);
 extern void update_io_ticks(void);
-extern void disk_util_timer_arm(void);
 extern void setup_log(struct io_log **);
 extern void finish_log(struct thread_data *, struct io_log *, const char *);
 extern void __finish_log(struct io_log *, const char *);
@@ -812,7 +820,7 @@ extern void set_genesis_time(void);
  * Init/option functions
  */
 extern int __must_check parse_options(int, char **);
-extern int fio_option_parse(struct thread_data *, const char *);
+extern int fio_options_parse(struct thread_data *, char **, int);
 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 *);
@@ -855,12 +863,10 @@ extern void print_status_init(int);
  */
 #ifdef FIO_HAVE_DISK_UTIL
 extern void show_disk_util(void);
-extern void disk_util_timer_arm(void);
 extern void init_disk_util(struct thread_data *);
 extern void update_io_ticks(void);
 #else
 #define show_disk_util()
-#define disk_util_timer_arm()
 #define init_disk_util(td)
 #define update_io_ticks()
 #endif
@@ -900,7 +906,7 @@ extern void free_io_mem(struct thread_data *);
 /*
  * io unit handling
  */
-#define queue_full(td) list_empty(&(td)->io_u_freelist)
+#define queue_full(td) flist_empty(&(td)->io_u_freelist)
 extern struct io_u *__get_io_u(struct thread_data *);
 extern struct io_u *get_io_u(struct thread_data *);
 extern void put_io_u(struct thread_data *, struct io_u *);
@@ -937,7 +943,7 @@ extern int load_blktrace(struct thread_data *, const char *);
 #endif
 
 struct ioengine_ops {
-       struct list_head list;
+       struct flist_head list;
        char name[16];
        int version;
        int flags;