X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=72ca7f6ce232bbc40736d1f0b1c1ad416f2e0f40;hp=b6ffe60b900cfa0f391d9e6c030e3e217f152817;hb=5995a6a46a4c697a6c68c02da3c7c46c0cdea23f;hpb=df9c26b10275a631e83e7cc92d5f7384998b2c49

diff --git a/fio.h b/fio.h
index b6ffe60b..72ca7f6c 100644
--- a/fio.h
+++ b/fio.h
@@ -24,6 +24,10 @@
 #include "mutex.h"
 #include "log.h"
 #include "debug.h"
+#include "file.h"
+#include "io_ddir.h"
+#include "ioengine.h"
+#include "iolog.h"
 
 #ifdef FIO_HAVE_GUASI
 #include <guasi.h>
@@ -33,218 +37,6 @@
 #include <sys/asynch.h>
 #endif
 
-enum fio_ddir {
-	DDIR_READ = 0,
-	DDIR_WRITE,
-	DDIR_SYNC,
-	DDIR_INVAL = -1,
-};
-
-enum td_ddir {
-	TD_DDIR_READ		= 1 << 0,
-	TD_DDIR_WRITE		= 1 << 1,
-	TD_DDIR_RAND		= 1 << 2,
-	TD_DDIR_RW		= TD_DDIR_READ | TD_DDIR_WRITE,
-	TD_DDIR_RANDREAD	= TD_DDIR_READ | TD_DDIR_RAND,
-	TD_DDIR_RANDWRITE	= TD_DDIR_WRITE | TD_DDIR_RAND,
-	TD_DDIR_RANDRW		= TD_DDIR_RW | TD_DDIR_RAND,
-};
-
-enum file_lock_mode {
-	FILE_LOCK_NONE,
-	FILE_LOCK_EXCLUSIVE,
-	FILE_LOCK_READWRITE,
-};
-
-/*
- * Use for maintaining statistics
- */
-struct io_stat {
-	unsigned long max_val;
-	unsigned long min_val;
-	unsigned long samples;
-
-	double mean;
-	double S;
-};
-
-/*
- * A single data sample
- */
-struct io_sample {
-	unsigned long time;
-	unsigned long val;
-	enum fio_ddir ddir;
-};
-
-/*
- * Dynamically growing data sample log
- */
-struct io_log {
-	unsigned long nr_samples;
-	unsigned long max_samples;
-	struct io_sample *log;
-};
-
-/*
- * When logging io actions, this matches a single sent io_u
- */
-struct io_piece {
-	union {
-		struct rb_node rb_node;
-		struct flist_head list;
-	};
-	union {
-		int fileno;
-		struct fio_file *file;
-	};
-	unsigned long long offset;
-	unsigned long len;
-	enum fio_ddir ddir;
-	union {
-		unsigned long delay;
-		unsigned int file_action;
-	};
-};
-
-enum {
-	IO_U_F_FREE	= 1 << 0,
-	IO_U_F_FLIGHT	= 1 << 1,
-};
-
-struct thread_data;
-
-/*
- * The io unit
- */
-struct io_u {
-	union {
-#ifdef FIO_HAVE_LIBAIO
-		struct iocb iocb;
-#endif
-#ifdef FIO_HAVE_POSIXAIO
-		struct aiocb aiocb;
-#endif
-#ifdef FIO_HAVE_SGIO
-		struct sg_io_hdr hdr;
-#endif
-#ifdef FIO_HAVE_GUASI
-		guasi_req_t greq;
-#endif
-#ifdef FIO_HAVE_SOLARISAIO
-		aio_result_t resultp;
-#endif
-	};
-	struct timeval start_time;
-	struct timeval issue_time;
-
-	/*
-	 * Allocated/set buffer and length
-	 */
-	void *buf;
-	unsigned long buflen;
-	unsigned long long offset;
-	unsigned long long endpos;
-
-	/*
-	 * IO engine state, may be different from above when we get
-	 * partial transfers / residual data counts
-	 */
-	void *xfer_buf;
-	unsigned long xfer_buflen;
-
-	unsigned int resid;
-	unsigned int error;
-
-	enum fio_ddir ddir;
-
-	/*
-	 * io engine private data
-	 */
-	union {
-		unsigned int index;
-		unsigned int seen;
-		void *engine_data;
-	};
-
-	unsigned int flags;
-
-	struct fio_file *file;
-
-	struct flist_head list;
-
-	/*
-	 * Callback for io completion
-	 */
-	int (*end_io)(struct thread_data *, struct io_u *);
-};
-
-/*
- * io_ops->queue() return values
- */
-enum {
-	FIO_Q_COMPLETED	= 0,		/* completed sync */
-	FIO_Q_QUEUED	= 1,		/* queued, will complete async */
-	FIO_Q_BUSY	= 2,		/* no more room, call ->commit() */
-};
-
-#define FIO_HDR_MAGIC	0xf00baaef
-
-enum {
-	VERIFY_NONE = 0,		/* no verification */
-	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_CRC32C_INTEL,		/* crc32c sum data blocks with hw */
-	VERIFY_CRC16,			/* crc16 sum data blocks */
-	VERIFY_CRC7,			/* crc7 sum data blocks */
-	VERIFY_SHA256,			/* sha256 sum data blocks */
-	VERIFY_SHA512,			/* sha512 sum data blocks */
-	VERIFY_META,			/* block_num, timestamp etc. */
-	VERIFY_NULL,			/* pretend to verify */
-};
-
-/*
- * A header structure associated with each checksummed data block. It is
- * followed by a checksum specific header that contains the verification
- * data.
- */
-struct verify_header {
-	unsigned int fio_magic;
-	unsigned int len;
-	unsigned int verify_type;
-};
-
-struct vhdr_md5 {
-	uint32_t md5_digest[16];
-};
-struct vhdr_sha512 {
-	uint8_t sha512[128];
-};
-struct vhdr_sha256 {
-	uint8_t sha256[128];
-};
-struct vhdr_crc64 {
-	uint64_t crc64;
-};
-struct vhdr_crc32 {
-	uint32_t crc32;
-};
-struct vhdr_crc16 {
-	uint16_t crc16;
-};
-struct vhdr_crc7 {
-	uint8_t crc7;
-};
-struct vhdr_meta {
-	uint64_t offset;
-	unsigned char thread;
-	unsigned short numberio;
-	unsigned long time_sec;
-	unsigned long time_usec;
-};
-
 struct group_run_stats {
 	unsigned long long max_run[2], min_run[2];
 	unsigned long long max_bw[2], min_bw[2];
@@ -263,87 +55,6 @@ enum fio_memtype {
 	MEM_MMAPHUGE,	/* memory mapped huge file */
 };
 
-/*
- * The type of object we are working on
- */
-enum fio_filetype {
-	FIO_TYPE_FILE = 1,		/* plain file */
-	FIO_TYPE_BD,			/* block device */
-	FIO_TYPE_CHAR,			/* character device */
-	FIO_TYPE_PIPE,			/* pipe */
-};
-
-enum fio_ioengine_flags {
-	FIO_SYNCIO	= 1 << 0,	/* io engine has synchronous ->queue */
-	FIO_RAWIO	= 1 << 1,	/* some sort of direct/raw io */
-	FIO_DISKLESSIO	= 1 << 2,	/* no disk involved */
-	FIO_NOEXTEND	= 1 << 3,	/* engine can't extend file */
-	FIO_NODISKUTIL  = 1 << 4,       /* diskutil can't handle filename */
-	FIO_UNIDIR	= 1 << 5,	/* engine is uni-directional */
-	FIO_NOIO	= 1 << 6,	/* thread does only pseudo IO */
-	FIO_SIGQUIT	= 1 << 7,	/* needs SIGQUIT to exit */
-};
-
-enum fio_file_flags {
-	FIO_FILE_OPEN		= 1 << 0,	/* file is open */
-	FIO_FILE_CLOSING	= 1 << 1,	/* file being closed */
-	FIO_FILE_EXTEND		= 1 << 2,	/* needs extend */
-	FIO_FILE_DONE		= 1 << 3,	/* io completed to this file */
-	FIO_SIZE_KNOWN		= 1 << 4,	/* size has been set */
-	FIO_FILE_HASHED		= 1 << 5,	/* file is on hash */
-};
-
-/*
- * Each thread_data structure has a number of files associated with it,
- * this structure holds state information for a single file.
- */
-struct fio_file {
-	struct flist_head hash_list;
-	enum fio_filetype filetype;
-
-	/*
-	 * A file may not be a file descriptor, let the io engine decide
-	 */
-	union {
-		unsigned long file_data;
-		int fd;
-	};
-
-	/*
-	 * filename and possible memory mapping
-	 */
-	char *file_name;
-	void *mmap;
-	unsigned int major, minor;
-
-	/*
-	 * 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;
-
-	/*
-	 * if io is protected by a semaphore, this is set
-	 */
-	struct fio_mutex *lock;
-	void *lock_owner;
-	unsigned int lock_batch;
-	enum fio_ddir lock_ddir;
-
-	/*
-	 * block map for random io
-	 */
-	unsigned int *file_map;
-	unsigned int num_maps;
-	unsigned int last_free_lookup;
-
-	int references;
-	enum fio_file_flags flags;
-};
-
 /*
  * How many depth levels to log
  */
@@ -429,10 +140,11 @@ struct thread_options {
 	unsigned long long start_offset;
 
 	unsigned int bs[2];
+	unsigned int ba[2];
 	unsigned int min_bs[2];
 	unsigned int max_bs[2];
-	struct bssplit *bssplit;
-	unsigned int bssplit_nr;
+	struct bssplit *bssplit[2];
+	unsigned int bssplit_nr[2];
 
 	unsigned int nr_files;
 	unsigned int open_files;
@@ -445,6 +157,7 @@ struct thread_options {
 	unsigned int create_fsync;
 	unsigned int create_on_open;
 	unsigned int end_fsync;
+	unsigned int pre_read;
 	unsigned int sync_io;
 	unsigned int verify;
 	unsigned int do_verify;
@@ -571,6 +284,8 @@ struct thread_data {
 
 	char *sysfs_root;
 
+	unsigned long rand_seeds[6];
+
 	os_random_state_t bsrange_state;
 	os_random_state_t verify_state;
 
@@ -781,46 +496,30 @@ struct disk_util {
 
 	unsigned long msec;
 	struct timeval time;
-};
 
-#define DISK_UTIL_MSEC	(250)
-
-/*
- * Log exports
- */
-enum file_log_act {
-	FIO_LOG_ADD_FILE,
-	FIO_LOG_OPEN_FILE,
-	FIO_LOG_CLOSE_FILE,
-	FIO_LOG_UNLINK_FILE,
+	struct fio_mutex *lock;
+	unsigned long users;
 };
 
-extern int __must_check read_iolog_get(struct thread_data *, struct io_u *);
-extern void log_io_u(struct thread_data *, struct io_u *);
-extern void log_file(struct thread_data *, struct fio_file *, enum file_log_act);
-extern int __must_check init_iolog(struct thread_data *td);
-extern void log_io_piece(struct thread_data *, struct io_u *);
-extern void queue_io_piece(struct thread_data *, struct io_piece *);
-extern void prune_io_piece_log(struct thread_data *);
-extern void write_iolog_close(struct thread_data *);
+static inline void disk_util_inc(struct disk_util *du)
+{
+	if (du) {
+		fio_mutex_down(du->lock);
+		du->users++;
+		fio_mutex_up(du->lock);
+	}
+}
 
-/*
- * Logging
- */
-extern void add_clat_sample(struct thread_data *, enum fio_ddir, unsigned long);
-extern void add_slat_sample(struct thread_data *, enum fio_ddir, unsigned long);
-extern void add_bw_sample(struct thread_data *, enum fio_ddir, struct timeval *);
-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 setup_log(struct io_log **);
-extern void finish_log(struct thread_data *, struct io_log *, const char *);
-extern void finish_log_named(struct thread_data *, struct io_log *, const char *, const char *);
-extern void __finish_log(struct io_log *, const char *);
-extern struct io_log *agg_io_log[2];
-extern int write_bw_log;
-extern void add_agg_sample(unsigned long, enum fio_ddir);
+static inline void disk_util_dec(struct disk_util *du)
+{
+	if (du) {
+		fio_mutex_down(du->lock);
+		du->users--;
+		fio_mutex_up(du->lock);
+	}
+}
+
+#define DISK_UTIL_MSEC	(250)
 
 /*
  * Time functions
@@ -853,31 +552,10 @@ 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 *);
+extern void td_fill_rand_seeds(struct thread_data *);
 #define FIO_GETOPT_JOB		0x89988998
 #define FIO_NR_OPTIONS		128
 
-/*
- * File setup/shutdown
- */
-extern void close_files(struct thread_data *);
-extern void close_and_free_files(struct thread_data *);
-extern int __must_check setup_files(struct thread_data *);
-extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_file *);
-extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
-extern int __must_check generic_close_file(struct thread_data *, struct fio_file *);
-extern int __must_check generic_get_file_size(struct thread_data *, struct fio_file *);
-extern int add_file(struct thread_data *, const char *);
-extern void get_file(struct fio_file *);
-extern int __must_check put_file(struct thread_data *, struct fio_file *);
-extern void lock_file(struct thread_data *, struct fio_file *, enum fio_ddir);
-extern void unlock_file(struct thread_data *, struct fio_file *);
-extern void unlock_file_all(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 *);
-extern int get_fileno(struct thread_data *, const char *);
-extern void free_release_files(struct thread_data *);
-
 /*
  * ETA/status stuff
  */
@@ -909,6 +587,7 @@ enum {
 	TD_INITIALIZED,
 	TD_RAMP,
 	TD_RUNNING,
+	TD_PRE_READING,
 	TD_VERIFYING,
 	TD_FSYNCING,
 	TD_EXITED,
@@ -917,13 +596,6 @@ enum {
 
 extern void td_set_runstate(struct thread_data *, int);
 
-/*
- * Verify helpers
- */
-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 thread_data *, struct io_u *);
-
 /*
  * Memory helpers
  */
@@ -932,41 +604,11 @@ extern void fio_unpin_memory(void);
 extern int __must_check allocate_io_mem(struct thread_data *);
 extern void free_io_mem(struct thread_data *);
 
-/*
- * io unit handling
- */
-#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 *);
-extern void requeue_io_u(struct thread_data *, struct io_u **);
-extern long __must_check io_u_sync_complete(struct thread_data *, struct io_u *);
-extern long __must_check io_u_queued_complete(struct thread_data *, int);
-extern void io_u_queued(struct thread_data *, struct io_u *);
-extern void io_u_log_error(struct thread_data *, struct io_u *);
-extern void io_u_mark_depth(struct thread_data *, unsigned int);
-extern void io_u_fill_buffer(struct thread_data *td, struct io_u *, unsigned int);
-void io_u_mark_complete(struct thread_data *, unsigned int);
-void io_u_mark_submit(struct thread_data *, unsigned int);
-
 /*
  * Reset stats after ramp time completes
  */
 extern void reset_all_stats(struct thread_data *);
 
-/*
- * io engine entry points
- */
-extern int __must_check td_io_init(struct thread_data *);
-extern int __must_check td_io_prep(struct thread_data *, struct io_u *);
-extern int __must_check td_io_queue(struct thread_data *, struct io_u *);
-extern int __must_check td_io_sync(struct thread_data *, struct fio_file *);
-extern int __must_check td_io_getevents(struct thread_data *, unsigned int, unsigned int, struct timespec *);
-extern int __must_check td_io_commit(struct thread_data *);
-extern int __must_check td_io_open_file(struct thread_data *, struct fio_file *);
-extern int td_io_close_file(struct thread_data *, struct fio_file *);
-extern int __must_check td_io_get_file_size(struct thread_data *, struct fio_file *);
-
 /*
  * blktrace support
  */
@@ -975,34 +617,6 @@ extern int is_blktrace(const char *);
 extern int load_blktrace(struct thread_data *, const char *);
 #endif
 
-struct ioengine_ops {
-	struct flist_head list;
-	char name[16];
-	int version;
-	int flags;
-	int (*setup)(struct thread_data *);
-	int (*init)(struct thread_data *);
-	int (*prep)(struct thread_data *, struct io_u *);
-	int (*queue)(struct thread_data *, struct io_u *);
-	int (*commit)(struct thread_data *);
-	int (*getevents)(struct thread_data *, unsigned int, unsigned int, struct timespec *);
-	struct io_u *(*event)(struct thread_data *, int);
-	int (*cancel)(struct thread_data *, struct io_u *);
-	void (*cleanup)(struct thread_data *);
-	int (*open_file)(struct thread_data *, struct fio_file *);
-	int (*close_file)(struct thread_data *, struct fio_file *);
-	int (*get_file_size)(struct thread_data *, struct fio_file *);
-	void *data;
-	void *dlhandle;
-};
-
-#define FIO_IOOPS_VERSION	10
-
-extern struct ioengine_ops *load_ioengine(struct thread_data *, const char *);
-extern void register_ioengine(struct ioengine_ops *);
-extern void unregister_ioengine(struct ioengine_ops *);
-extern void close_ioengine(struct thread_data *);
-
 /*
  * Mark unused variables passed to ops functions as unused, to silence gcc
  */
@@ -1032,6 +646,8 @@ static inline void fio_file_reset(struct fio_file *f)
 {
 	f->last_free_lookup = 0;
 	f->last_pos = f->file_offset;
+	if (f->file_map)
+		memset(f->file_map, 0, f->num_maps * sizeof(int));
 }
 
 static inline void clear_error(struct thread_data *td)