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

diff --git a/file.h b/file.h
index 38e9d0d4..e57bebcf 100644
--- a/file.h
+++ b/file.h
@@ -6,6 +6,8 @@
 #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
@@ -61,8 +63,8 @@ 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;
@@ -95,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
@@ -108,10 +110,9 @@ struct fio_file {
 	/*
 	 * block map for random io
 	 */
-	unsigned long *file_map;
-	unsigned long num_maps;
-	unsigned long last_free_lookup;
-	unsigned failed_rands;
+	struct axmap *io_axmap;
+
+	struct fio_lfsr lfsr;
 
 	/*
 	 * Used for zipf random distribution
@@ -177,13 +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->failed_rands = 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(unsigned long));
+	if (f->io_axmap)
+		axmap_reset(f->io_axmap);
 }
 
 #endif