X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=file.h;h=fa8c1d236c498da467a5ea716642d66ec56abef3;hp=7024d5ee9d6bcb8f1a4ecb71b46f2297ea836226;hb=59e733f272bbbe32f2aaa4f068d99e7f71fce337;hpb=c592b9fe12d4739d99d5bece517e304804876df6

diff --git a/file.h b/file.h
index 7024d5ee..fa8c1d23 100644
--- a/file.h
+++ b/file.h
@@ -20,6 +20,7 @@ enum fio_file_flags {
 	FIO_FILE_done		= 1 << 3,	/* io completed to this file */
 	FIO_FILE_size_known	= 1 << 4,	/* size has been set */
 	FIO_FILE_hashed		= 1 << 5,	/* file is on hash */
+	FIO_FILE_partial_mmap	= 1 << 6,	/* can't do full mmap */
 };
 
 enum file_lock_mode {
@@ -46,13 +47,8 @@ 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;
 
 	/*
 	 * filename and possible memory mapping
@@ -72,6 +68,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
@@ -114,6 +119,7 @@ FILE_FLAG_FNS(extend);
 FILE_FLAG_FNS(done);
 FILE_FLAG_FNS(size_known);
 FILE_FLAG_FNS(hashed);
+FILE_FLAG_FNS(partial_mmap);
 #undef FILE_FLAG_FNS
 
 /*
@@ -129,8 +135,10 @@ 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 *);
 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 *);
@@ -144,6 +152,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));
 }