file hash: don't close file fd on lookup/add race

[fio.git] / file.h

diff --git a/file.h b/file.h
index 67ef24f109f32da44778745153861249f8490ccd..11695e2f84a0d54158b6ea76614f693aec005b46 100644 (file)
--- 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
@@ -62,7 +65,8 @@ struct fio_file {
 
        void *file_data;
        int fd;
-#ifdef __CYGWIN__
+       int shadow_fd;
+#ifdef WIN32
        HANDLE hFile;
        HANDLE ioCP;
 #endif
@@ -72,6 +76,7 @@ struct fio_file {
         */
        char *file_name;
        unsigned int major, minor;
+       int fileno;
 
        void *mmap_ptr;
        size_t mmap_sz;
@@ -106,10 +111,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;
@@ -146,11 +155,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 *);
@@ -168,13 +179,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