X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.h;h=ec8d593519dc0cfb4478c0c40f1dd92acc1419ed;hb=bac39e0e8807a1d52863ad8304e67221df2bc63b;hp=a155518160757bf16e3d9fb7210d51a4da4e130d;hpb=de605666880852ba9d1a0469723126b09782c520;p=fio.git

diff --git a/fio.h b/fio.h
index a1555181..ec8d5935 100644
--- 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
@@ -187,6 +195,7 @@ enum {
 	VERIFY_MD5,			/* md5 sum data blocks */
 	VERIFY_CRC64,			/* crc64 sum data blocks */
 	VERIFY_CRC32,			/* crc32 sum data blocks */
+	VERIFY_CRC32C,			/* crc32c sum data blocks */
 	VERIFY_CRC16,			/* crc16 sum data blocks */
 	VERIFY_CRC7,			/* crc7 sum data blocks */
 	VERIFY_SHA256,			/* sha256 sum data blocks */
@@ -288,7 +297,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;
 
 	/*
@@ -410,6 +419,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 +575,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 +622,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
@@ -739,7 +749,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;
@@ -811,7 +821,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 *);
@@ -897,7 +907,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 *);
@@ -934,7 +944,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;