Merge branch 'dev' of https://github.com/smartxworks/fio

[fio.git] / file.h

diff --git a/file.h b/file.h
index 9801bb584007558da4d7c2a17e78f50133c22fb6..e50c0f9c3fac752455bfbe74701fd86b04b844ad 100644 (file)
--- a/file.h
+++ b/file.h
@@ -10,6 +10,9 @@
 #include "lib/lfsr.h"
 #include "lib/gauss.h"
 
+/* Forward declarations */
+struct zoned_block_device_info;
+
 /*
  * The type of object we are working on
  */
@@ -63,6 +66,7 @@ enum fio_fallocate_mode {
        FIO_FALLOCATE_NONE      = 1,
        FIO_FALLOCATE_POSIX     = 2,
        FIO_FALLOCATE_KEEP_SIZE = 3,
+       FIO_FALLOCATE_NATIVE    = 4,
 };
 
 /*
@@ -85,7 +89,6 @@ struct fio_file {
         */
        unsigned int major, minor;
        int fileno;
-       int bs;
        char *file_name;
 
        /*
@@ -96,6 +99,11 @@ struct fio_file {
        uint64_t file_offset;
        uint64_t io_size;
 
+       /*
+        * Zoned block device information. See also zonemode=zbd.
+        */
+       struct zoned_block_device_info *zbd_info;
+
        /*
         * Track last end and last start of IO for a given data direction
         */
@@ -124,7 +132,7 @@ struct fio_file {
         * if io is protected by a semaphore, this is set
         */
        union {
-               struct fio_mutex *lock;
+               struct fio_sem *lock;
                struct fio_rwlock *rwlock;
        };
 
@@ -187,11 +195,17 @@ extern void close_and_free_files(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 *);
+#ifdef __cplusplus
+extern "C" {
+#endif
 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 *);
+#ifdef __cplusplus
+}
+#endif
 extern int __must_check file_lookup_open(struct fio_file *f, int flags);
-extern int __must_check pre_read_files(struct thread_data *);
+extern bool __must_check pre_read_files(struct thread_data *);
 extern unsigned long long get_rand_file_size(struct thread_data *td);
 extern int add_file(struct thread_data *, const char *, int, int);
 extern int add_file_exclusive(struct thread_data *, const char *);
@@ -202,7 +216,7 @@ extern void lock_file(struct thread_data *, struct fio_file *, enum fio_ddir);
 extern void unlock_file(struct thread_data *, struct fio_file *);
 extern void unlock_file_all(struct thread_data *, struct fio_file *);
 extern int add_dir_files(struct thread_data *, const char *);
-extern int init_random_map(struct thread_data *);
+extern bool 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 *);
@@ -210,5 +224,6 @@ extern void filesetup_mem_free(void);
 extern void fio_file_reset(struct thread_data *, struct fio_file *);
 extern bool fio_files_done(struct thread_data *);
 extern bool exists_and_not_regfile(const char *);
+extern int fio_set_directio(struct thread_data *, struct fio_file *);
 
 #endif