Add o->lockmem to conversion functions

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index 51ac0908a2c3c1dccaebd549cd74c593b3fe2aa6..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
         */
@@ -232,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;
@@ -314,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;
 
@@ -376,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
         */