Merge branch 'master' into gfio

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 61f4f5766e0904181689c09b1d15a4b664b25611..a78684cf985030f861da02a68f77de30d3f114fe 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -43,6 +43,7 @@ struct thread_options {
        char *filename;
        char *opendir;
        char *ioengine;
+       char *mmapfile;
        enum td_ddir td_ddir;
        unsigned int rw_seq;
        unsigned int kb_base;
@@ -77,6 +78,7 @@ struct thread_options {
        unsigned int create_serialize;
        unsigned int create_fsync;
        unsigned int create_on_open;
+       unsigned int create_only;
        unsigned int end_fsync;
        unsigned int pre_read;
        unsigned int sync_io;
@@ -98,9 +100,6 @@ struct thread_options {
        unsigned int override_sync;
        unsigned int rand_repeatable;
        unsigned int use_os_rand;
-       unsigned int write_lat_log;
-       unsigned int write_bw_log;
-       unsigned int write_iops_log;
        unsigned int log_avg_msec;
        unsigned int norandommap;
        unsigned int softrandommap;
@@ -125,6 +124,7 @@ struct thread_options {
        unsigned long long zone_range;
        unsigned long long zone_size;
        unsigned long long zone_skip;
+       unsigned long long lockmem;
        enum fio_memtype mem_type;
        unsigned int mem_align;
 
@@ -139,6 +139,8 @@ struct thread_options {
        unsigned int rwmixcycle;
        unsigned int rwmix[2];
        unsigned int nice;
+       unsigned int ioprio;
+       unsigned int ioprio_class;
        unsigned int file_service_type;
        unsigned int group_reporting;
        unsigned int fadvise_hint;
@@ -226,6 +228,7 @@ struct thread_options_pack {
        uint8_t filename[FIO_TOP_STR_MAX];
        uint8_t opendir[FIO_TOP_STR_MAX];
        uint8_t ioengine[FIO_TOP_STR_MAX];
+       uint8_t mmapfile[FIO_TOP_STR_MAX];
        uint32_t td_ddir;
        uint32_t rw_seq;
        uint32_t kb_base;
@@ -260,6 +263,7 @@ struct thread_options_pack {
        uint32_t create_serialize;
        uint32_t create_fsync;
        uint32_t create_on_open;
+       uint32_t create_only;
        uint32_t end_fsync;
        uint32_t pre_read;
        uint32_t sync_io;
@@ -281,9 +285,6 @@ struct thread_options_pack {
        uint32_t override_sync;
        uint32_t rand_repeatable;
        uint32_t use_os_rand;
-       uint32_t write_lat_log;
-       uint32_t write_bw_log;
-       uint32_t write_iops_log;
        uint32_t log_avg_msec;
        uint32_t norandommap;
        uint32_t softrandommap;
@@ -308,6 +309,7 @@ struct thread_options_pack {
        uint64_t zone_range;
        uint64_t zone_size;
        uint64_t zone_skip;
+       uint64_t lockmem;
        uint32_t mem_type;
        uint32_t mem_align;
 
@@ -322,6 +324,8 @@ struct thread_options_pack {
        uint32_t rwmixcycle;
        uint32_t rwmix[2];
        uint32_t nice;
+       uint32_t ioprio;
+       uint32_t ioprio_class;
        uint32_t file_service_type;
        uint32_t group_reporting;
        uint32_t fadvise_hint;