X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=b48ef70a4a8f151518c0b78e2c6f8861b3d7d790;hp=eed49503ba1367b57ed413c238fc8412969490cf;hb=bb8895e07c6d6417410545f45d34b1b7916cd90a;hpb=25205e975e6dce6079a4b94d656724011f1aabd0

diff --git a/fio.h b/fio.h
index eed49503..b48ef70a 100644
--- a/fio.h
+++ b/fio.h
@@ -66,14 +66,20 @@ struct io_u {
 	char *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,16 +158,15 @@ 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];
 	pthread_t thread;
 	int thread_number;
@@ -168,6 +174,7 @@ struct thread_data {
 	enum fio_filetype filetype;
 	struct fio_file *files;
 	unsigned int nr_files;
+	unsigned int nr_uniq_files;
 	unsigned int next_file;
 	int error;
 	pid_t pid;
@@ -178,20 +185,24 @@ 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 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;
 	unsigned int min_bs;
@@ -212,12 +223,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;
 
@@ -333,12 +345,7 @@ struct thread_data {
 #define td_verror(td, err)	__td_verror((td), (err), strerror((err)))
 #define td_vmsg(td, err, msg)	__td_verror((td), (err), (msg))
 
-extern struct io_u *__get_io_u(struct thread_data *);
-extern void put_io_u(struct thread_data *, struct io_u *);
-
 extern int rate_quit;
-extern int write_lat_log;
-extern int write_bw_log;
 extern int exitall_on_terminate;
 extern int thread_number;
 extern int shm_id;
@@ -362,6 +369,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];
@@ -479,6 +498,33 @@ extern void populate_verify_io_u(struct thread_data *, struct io_u *);
 extern int get_next_verify(struct thread_data *td, struct io_u *);
 extern int do_io_u_verify(struct thread_data *, struct io_u **);
 
+/*
+ * Memory helpers
+ */
+extern int fio_pin_memory(void);
+extern void fio_unpin_memory(void);
+extern int allocate_io_mem(struct thread_data *);
+extern void free_io_mem(struct thread_data *);
+
+/*
+ * io unit handling
+ */
+#define queue_full(td)	list_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 *, struct fio_file *);
+extern void put_io_u(struct thread_data *, struct io_u *);
+extern void ios_completed(struct thread_data *, struct io_completion_data *);
+extern void io_completed(struct thread_data *, struct io_u *, struct io_completion_data *);
+
+/*
+ * io engine entry points
+ */
+extern int td_io_init(struct thread_data *);
+extern int td_io_prep(struct thread_data *, struct io_u *);
+extern int td_io_queue(struct thread_data *, struct io_u *);
+extern int td_io_sync(struct thread_data *, struct fio_file *);
+extern int td_io_getevents(struct thread_data *, int, int, struct timespec *);
+
 /*
  * This is a pretty crappy semaphore implementation, but with the use that fio
  * has (just signalling start/go conditions), it doesn't have to be better.
@@ -524,14 +570,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 *);
 
 /*
@@ -539,7 +584,9 @@ extern void close_ioengine(struct thread_data *);
  */
 #define fio_unused	__attribute((__unused__))
 
+#define for_each_td(td, i)	\
+	for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
 #define for_each_file(td, f, i)	\
-	for ((i) = 0, (f) = &(td)->files[0]; (i) < (int) (td)->nr_files; (i)++, (f) = &(td)->files[(i)])
+	for ((i) = 0, (f) = &(td)->files[0]; (i) < (int) (td)->nr_files; (i)++, (f)++)
 
 #endif