X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=file.h;h=3024c5440094f4a711b993e80dc6b81264f42893;hb=1cad7121e8e6c59440ae43545be05fa302e4110d;hp=51df839e8c0eaa1ca1262dc3b219f9c9471a2a71;hpb=89ac1d48971578ccb0645c292d4a058340aeb909;p=fio.git

diff --git a/file.h b/file.h
index 51df839e..3024c544 100644
--- a/file.h
+++ b/file.h
@@ -5,6 +5,9 @@
 #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
@@ -107,10 +110,14 @@ 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
+	 */
+	struct zipf_state zipf;
 
 	int references;
 	enum fio_file_flags flags;
@@ -147,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 *);
@@ -169,13 +178,11 @@ 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