X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=file.h;h=e57bebcffff605c4c5996b88287cb40ff9c9254d;hp=fa8c1d236c498da467a5ea716642d66ec56abef3;hb=1d69e8acd7d338822bfe9630e7cdceee159c7bd2;hpb=9e700a738f816bebb22333de97414b534c79c267

diff --git a/file.h b/file.h
index fa8c1d23..e57bebcf 100644
--- a/file.h
+++ b/file.h
@@ -1,7 +1,13 @@
 #ifndef FIO_FILE_H
 #define FIO_FILE_H
 
+#include <string.h>
+#include "compiler/compiler.h"
 #include "io_ddir.h"
+#include "flist.h"
+#include "lib/zipf.h"
+#include "lib/axmap.h"
+#include "lib/lfsr.h"
 
 /*
  * The type of object we are working on
@@ -39,6 +45,16 @@ enum {
 	FIO_FSERVICE_SEQ	= 3,
 };
 
+/*
+ * No pre-allocation when laying down files, or call posix_fallocate(), or
+ * call fallocate() with FALLOC_FL_KEEP_SIZE set.
+ */
+enum fio_fallocate_mode {
+	FIO_FALLOCATE_NONE	= 1,
+	FIO_FALLOCATE_POSIX	= 2,
+	FIO_FALLOCATE_KEEP_SIZE	= 3,
+};
+
 /*
  * Each thread_data structure has a number of files associated with it,
  * this structure holds state information for a single file.
@@ -47,14 +63,19 @@ struct fio_file {
 	struct flist_head hash_list;
 	enum fio_filetype filetype;
 
-	void *file_data;
 	int fd;
+	int shadow_fd;
+#ifdef WIN32
+	HANDLE hFile;
+	HANDLE ioCP;
+#endif
 
 	/*
 	 * filename and possible memory mapping
 	 */
 	char *file_name;
 	unsigned int major, minor;
+	int fileno;
 
 	void *mmap_ptr;
 	size_t mmap_sz;
@@ -76,7 +97,7 @@ struct fio_file {
 	/*
 	 * For use by the io engine
 	 */
-	unsigned long long file_pos;
+	uint64_t engine_data;
 
 	/*
 	 * if io is protected by a semaphore, this is set
@@ -89,9 +110,14 @@ struct fio_file {
 	/*
 	 * block map for random io
 	 */
-	unsigned int *file_map;
-	unsigned int num_maps;
-	unsigned int last_free_lookup;
+	struct axmap *io_axmap;
+
+	struct fio_lfsr lfsr;
+
+	/*
+	 * Used for zipf random distribution
+	 */
+	struct zipf_state zipf;
 
 	int references;
 	enum fio_file_flags flags;
@@ -128,11 +154,13 @@ FILE_FLAG_FNS(partial_mmap);
 struct thread_data;
 extern void close_files(struct thread_data *);
 extern void close_and_free_files(struct thread_data *);
+extern unsigned long long get_start_offset(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 __must_check file_lookup_open(struct fio_file *f, int flags);
 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 *);
@@ -150,12 +178,10 @@ extern void free_release_files(struct thread_data *);
 
 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));
+	if (f->io_axmap)
+		axmap_reset(f->io_axmap);
 }
 
 #endif