Rework file random map

[fio.git] / file.h

diff --git a/file.h b/file.h
index 38e9d0d43003c466ae13defebea219db8057b7c1..ce92ff75305dda0438ec041dcfa7f37c6fb5ce83 100644 (file)
--- a/file.h
+++ b/file.h
@@ -6,6 +6,7 @@
 #include "io_ddir.h"
 #include "flist.h"
 #include "lib/zipf.h"
+#include "lib/bitmap.h"
 
 /*
  * The type of object we are working on
@@ -108,10 +109,7 @@ 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 bitmap *io_bitmap;
 
        /*
         * Used for zipf random distribution
@@ -177,13 +175,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_bitmap)
+               bitmap_reset(f->io_bitmap);
 }
 
 #endif