X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=1a318921c59eb6b7c620559455537e4f8240d52d;hp=d0629ece3fe6d3f2463a22fbc4dd16628c1ce2ae;hb=0798ba36674a7a244e8bc10877e322973a5ca938;hpb=d2f3ac3592a5674fefa082cb439cc72355d2fed0

diff --git a/fio.h b/fio.h
index d0629ece..1a318921 100644
--- a/fio.h
+++ b/fio.h
@@ -13,11 +13,13 @@
 #include <string.h>
 #include <getopt.h>
 
+#include "compiler/compiler.h"
 #include "list.h"
+#include "rbtree.h"
 #include "md5.h"
 #include "crc32.h"
-#include "arch.h"
-#include "os.h"
+#include "arch/arch.h"
+#include "os/os.h"
 #include "mutex.h"
 
 #ifdef FIO_HAVE_SYSLET
@@ -78,7 +80,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;
@@ -98,6 +103,8 @@ enum {
 	IO_U_F_FLIGHT	= 1 << 1,
 };
 
+struct thread_data;
+
 /*
  * The io unit
  */
@@ -158,7 +165,7 @@ struct io_u {
 	/*
 	 * Callback for io completion
 	 */
-	int (*end_io)(struct io_u *);
+	int (*end_io)(struct thread_data *, struct io_u *);
 };
 
 /*
@@ -176,6 +183,7 @@ enum {
 	VERIFY_NONE = 0,		/* no verification */
 	VERIFY_MD5,			/* md5 sum data blocks */
 	VERIFY_CRC32,			/* crc32 sum data blocks */
+	VERIFY_NULL,			/* pretend to verify */
 };
 
 /*
@@ -230,7 +238,11 @@ enum fio_file_flags {
 	FIO_FILE_OPEN		= 1 << 0,	/* file is open */
 	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_EXISTS		= 1 << 3,	/* file there */
+	FIO_FILE_EXTEND		= 1 << 4,	/* needs extend */
+	FIO_FILE_NOSORT		= 1 << 5,	/* don't sort verify blocks */
+	FIO_FILE_DONE		= 1 << 6,	/* io completed to this file */
+	FIO_SIZE_KNOWN		= 1 << 7,	/* size has been set */
 };
 
 /*
@@ -247,11 +259,20 @@ struct fio_file {
 		unsigned long file_data;
 		int fd;
 	};
+
+	/*
+	 * filename and possible memory mapping
+	 */
 	char *file_name;
 	void *mmap;
-	unsigned long long file_size;
+
+	/*
+	 * size of the file, offset into file, and io size from that offset
+	 */
 	unsigned long long real_file_size;
 	unsigned long long file_offset;
+	unsigned long long io_size;
+
 	unsigned long long last_pos;
 	unsigned long long last_completed_pos;
 
@@ -349,6 +370,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;
@@ -427,6 +449,7 @@ struct thread_data {
 	struct fio_file *files;
 	unsigned int files_index;
 	unsigned int nr_open_files;
+	unsigned int nr_done_files;
 	unsigned int nr_normal_files;
 	union {
 		unsigned int next_file;
@@ -478,7 +501,6 @@ struct thread_data {
 	unsigned long rate_blocks;
 	struct timeval lastrate;
 
-	unsigned long long io_size;
 	unsigned long long total_io_size;
 
 	unsigned long io_issues[2];
@@ -508,9 +530,15 @@ struct thread_data {
 	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;
 
 	/*
@@ -619,8 +647,9 @@ struct disk_util {
 	struct list_head list;
 
 	char *name;
+	char *sysfs_root;
 	char path[256];
-	dev_t dev;
+	int major, minor;
 
 	struct disk_util_stat dus;
 	struct disk_util_stat last_dus;
@@ -691,6 +720,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
 
@@ -708,6 +739,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
@@ -715,6 +747,21 @@ extern int init_random_map(struct thread_data *);
 extern void print_thread_status(void);
 extern void print_status_init(int);
 
+/*
+ * disk util stuff
+ */
+#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
+
 /*
  * Thread life cycle. Once a thread has a runstate beyond TD_INITIALIZED, it
  * will never back again. It may cycle between running/verififying/fsyncing.
@@ -737,7 +784,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
@@ -809,7 +856,7 @@ struct ioengine_ops {
 	void *dlhandle;
 };
 
-#define FIO_IOOPS_VERSION	6
+#define FIO_IOOPS_VERSION	7
 
 extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
 extern void register_ioengine(struct ioengine_ops *);
@@ -838,4 +885,10 @@ extern void close_ioengine(struct thread_data *);
 	}	\
 } while (0)
 
+static inline void clear_error(struct thread_data *td)
+{
+	td->error = 0;
+	td->verror[0] = '\0';
+}
+
 #endif