X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=file.h;h=10c5379c2f3ec6fee8141cc770dadea3b8467532;hb=ecc314ba7c5f02b7e90ac1dfbce1a74cd4e6d6fe;hp=dc22d4e058a177f373131acb370c838d4441b88f;hpb=e8462bd8250cf3ff2d41f17e1a4d4cefc70b6b37;p=fio.git

diff --git a/file.h b/file.h
index dc22d4e0..10c5379c 100644
--- a/file.h
+++ b/file.h
@@ -1,7 +1,9 @@
 #ifndef FIO_FILE_H
 #define FIO_FILE_H
 
+#include "compiler/compiler.h"
 #include "io_ddir.h"
+#include "flist.h"
 
 /*
  * The type of object we are working on
@@ -47,13 +49,12 @@ 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;
-	};
+	void *file_data;
+	int fd;
+#ifdef __CYGWIN__
+	HANDLE hFile;
+	HANDLE ioCP;
+#endif
 
 	/*
 	 * filename and possible memory mapping
@@ -73,6 +74,15 @@ struct fio_file {
 	unsigned long long io_size;
 
 	unsigned long long last_pos;
+	unsigned long long last_start;
+
+	unsigned long long first_write;
+	unsigned long long last_write;
+
+	/*
+	 * For use by the io engine
+	 */
+	unsigned long long file_pos;
 
 	/*
 	 * if io is protected by a semaphore, this is set
@@ -131,6 +141,7 @@ 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 __must_check pre_read_files(struct thread_data *);
 extern int add_file(struct thread_data *, const char *);
+extern int add_file_exclusive(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 put_file_log(struct thread_data *, struct fio_file *);
@@ -147,6 +158,8 @@ static inline void fio_file_reset(struct fio_file *f)
 {
 	f->last_free_lookup = 0;
 	f->last_pos = f->file_offset;
+	f->last_start = -1ULL;
+	f->file_pos = -1ULL;
 	if (f->file_map)
 		memset(f->file_map, 0, f->num_maps * sizeof(int));
 }