Obscure file randommap fix

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index 3b902a8da940ce20346a6e1d3a13c072735767b7..0fbf6ce8b45d2efa68cf4b892b1af71e6ac00462 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -218,6 +218,12 @@ enum fio_ioengine_flags {
        FIO_NODISKUTIL  = 1 << 4,       /* diskutil can't handle filename */
 };
 
+enum fio_file_flags {
+       FIO_FILE_OPEN           = 1 << 0,       /* file is open */
+       FIO_FILE_UNLINK         = 1 << 1,       /* unlink on close */
+       FIO_FILE_CLOSING        = 1 << 2,       /* file being closed */
+};
+
 /*
  * Each thread_data structure has a number of files associated with it,
  * this structure holds state information for a single file.
@@ -232,7 +238,7 @@ struct fio_file {
                unsigned long file_data;
                int fd;
        };
-       const char *file_name;
+       char *file_name;
        void *mmap;
        unsigned long long file_size;
        unsigned long long real_file_size;
@@ -247,8 +253,8 @@ struct fio_file {
        unsigned int num_maps;
        unsigned int last_free_lookup;
 
-       unsigned int unlink;
-       unsigned int open;
+       int references;
+       enum fio_file_flags flags;
 };
 
 /*
@@ -317,9 +323,10 @@ struct thread_data {
        int groupid;
        struct thread_stat ts;
        struct fio_file *files;
+       unsigned int files_index;
        unsigned int nr_files;
        unsigned int nr_open_files;
-       unsigned int nr_uniq_files;
+       unsigned int nr_normal_files;
        union {
                unsigned int next_file;
                os_random_state_t next_file_state;
@@ -650,6 +657,8 @@ extern int __must_check file_invalidate_cache(struct thread_data *, struct fio_f
 extern int __must_check generic_open_file(struct thread_data *, struct fio_file *);
 extern void generic_close_file(struct thread_data *, struct fio_file *);
 extern void add_file(struct thread_data *, const char *);
+extern void get_file(struct fio_file *);
+extern void put_file(struct thread_data *, struct fio_file *);
 
 /*
  * ETA/status stuff
@@ -766,7 +775,7 @@ extern void close_ioengine(struct thread_data *);
 #define for_each_td(td, i)     \
        for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
 #define for_each_file(td, f, i)        \
-       for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->open_files; (i)++, (f)++)
+       for ((i) = 0, (f) = &(td)->files[0]; (i) < (td)->nr_files; (i)++, (f)++)
 
 #define fio_assert(td, cond)   do {    \
        if (!(cond)) {                  \