Fix issue with openfiles= and file sizing

[fio.git] / file.h

diff --git a/file.h b/file.h
index 11695e2f84a0d54158b6ea76614f693aec005b46..19413fc8fa777d96b419e62c2c9d0c8433b4c2b2 100644 (file)
--- a/file.h
+++ b/file.h
@@ -63,7 +63,6 @@ struct fio_file {
        struct flist_head hash_list;
        enum fio_filetype filetype;
 
-       void *file_data;
        int fd;
        int shadow_fd;
 #ifdef WIN32
@@ -85,28 +84,28 @@ struct fio_file {
        /*
         * size of the file, offset into file, and io size from that offset
         */
-       unsigned long long real_file_size;
-       unsigned long long file_offset;
-       unsigned long long io_size;
+       uint64_t real_file_size;
+       uint64_t file_offset;
+       uint64_t io_size;
 
-       unsigned long long last_pos;
-       unsigned long long last_start;
+       uint64_t last_pos;
+       uint64_t last_start;
 
-       unsigned long long first_write;
-       unsigned long long last_write;
+       uint64_t first_write;
+       uint64_t last_write;
 
        /*
         * 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
         */
-       struct fio_mutex *lock;
-       void *lock_owner;
-       unsigned int lock_batch;
-       enum fio_ddir lock_ddir;
+       union {
+               struct fio_mutex *lock;
+               struct fio_rwlock *rwlock;
+       };
 
        /*
         * block map for random io
@@ -155,7 +154,7 @@ 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 uint64_t 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 *);
@@ -176,14 +175,7 @@ extern int init_random_map(struct thread_data *);
 extern void dup_files(struct thread_data *, struct thread_data *);
 extern int get_fileno(struct thread_data *, const char *);
 extern void free_release_files(struct thread_data *);
-
-static inline void fio_file_reset(struct fio_file *f)
-{
-       f->last_pos = f->file_offset;
-       f->last_start = -1ULL;
-       f->file_pos = -1ULL;
-       if (f->io_axmap)
-               axmap_reset(f->io_axmap);
-}
+void fio_file_reset(struct thread_data *, struct fio_file *);
+int fio_files_done(struct thread_data *);
 
 #endif