Add o->lockmem to conversion functions

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index c0fd7e26fed0bfb92cf6ee67b50a4de0293ae0f3..5a296c73d51aff00a7e3c19a27e9130b6b625a4c 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;
@@ -125,6 +126,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;
 
@@ -187,12 +189,6 @@ struct thread_options {
 
        char *ioscheduler;
 
-       /*
-        * CPU "io" cycle burner
-        */
-       unsigned int cpuload;
-       unsigned int cpucycle;
-
        /*
         * I/O Error handling
         */
@@ -218,6 +214,8 @@ struct thread_options {
        int flow_watermark;
        unsigned int flow_sleep;
 
+       unsigned long long offset_increment;
+
        unsigned int sync_file_range;
 };
 
@@ -230,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;
@@ -312,6 +311,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;
 
@@ -374,12 +374,6 @@ struct thread_options_pack {
 
        uint8_t ioscheduler[FIO_TOP_STR_MAX];
 
-       /*
-        * CPU "io" cycle burner
-        */
-       uint32_t cpuload;
-       uint32_t cpucycle;
-
        /*
         * I/O Error handling
         */
@@ -405,11 +399,14 @@ struct thread_options_pack {
        int32_t flow_watermark;
        uint32_t flow_sleep;
 
+       uint64_t offset_increment;
+
        uint32_t sync_file_range;
 } __attribute__((packed));
 
 extern void convert_thread_options_to_cpu(struct thread_options *o, struct thread_options_pack *top);
 extern void convert_thread_options_to_net(struct thread_options_pack *top, struct thread_options *);
 extern int fio_test_cconv(struct thread_options *);
+extern void options_default_fill(struct thread_options *o);
 
 #endif