Fix read/write mix and different levels of randomness

[fio.git] / file.h

diff --git a/file.h b/file.h
index 19413fc8fa777d96b419e62c2c9d0c8433b4c2b2..bb303103048cd847e3918efc18c98efbda1950fb 100644 (file)
--- a/file.h
+++ b/file.h
@@ -88,8 +88,11 @@ struct fio_file {
        uint64_t file_offset;
        uint64_t io_size;
 
-       uint64_t last_pos;
-       uint64_t last_start;
+       /*
+        * Track last end and last start of IO for a given data direction
+        */
+       uint64_t last_pos[DDIR_RWDIR_CNT];
+       uint64_t last_start[DDIR_RWDIR_CNT];
 
        uint64_t first_write;
        uint64_t last_write;
@@ -125,14 +128,19 @@ struct fio_file {
        struct disk_util *du;
 };
 
+struct file_name {
+       struct flist_head list;
+       char *filename;
+};
+
 #define FILE_FLAG_FNS(name)                                            \
 static inline void fio_file_set_##name(struct fio_file *f)             \
 {                                                                      \
-       (f)->flags |= FIO_FILE_##name;                                  \
+       (f)->flags = (enum fio_file_flags) ((f)->flags | FIO_FILE_##name);      \
 }                                                                      \
 static inline void fio_file_clear_##name(struct fio_file *f)           \
 {                                                                      \
-       (f)->flags &= ~FIO_FILE_##name;                                 \
+       (f)->flags = (enum fio_file_flags) ((f)->flags & ~FIO_FILE_##name);     \
 }                                                                      \
 static inline int fio_file_##name(struct fio_file *f)                  \
 {                                                                      \
@@ -154,7 +162,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 uint64_t get_start_offset(struct thread_data *);
+extern uint64_t get_start_offset(struct thread_data *, struct fio_file *);
 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 *);
@@ -162,7 +170,7 @@ 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(struct thread_data *, const char *, int, int);
 extern int add_file_exclusive(struct thread_data *, const char *);
 extern void get_file(struct fio_file *);
 extern int __must_check put_file(struct thread_data *, struct fio_file *);
@@ -175,6 +183,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 *);
+extern void filesetup_mem_free(void);
 void fio_file_reset(struct thread_data *, struct fio_file *);
 int fio_files_done(struct thread_data *);