X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.h;h=046171ae03c032243c19906ff8ce3e3afcba52c3;hp=dc2f84bad5778ff72252ecbb341dd6fd428d1bc8;hb=e1f365035a952233463d85d659bd960ba78f012e;hpb=d55954f4857da597b2620f2417678eec47285666

diff --git a/fio.h b/fio.h
index dc2f84ba..046171ae 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,
 };
 
 /*
@@ -178,6 +185,7 @@ struct thread_data {
 	enum fio_ddir ddir;
 	unsigned int iomix;
 	unsigned int ioprio;
+	unsigned int last_was_sync;
 
 	unsigned char sequential;
 	unsigned char odirect;
@@ -217,6 +225,7 @@ struct thread_data {
 	unsigned int write_iolog;
 	unsigned int rwmixcycle;
 	unsigned int rwmixread;
+	unsigned int rwmixwrite;
 	unsigned int nice;
 
 	char *iolog_file;
@@ -359,6 +368,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];
@@ -548,12 +569,11 @@ 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 void close_ioengine(struct thread_data *);