genfio: Splitting gen_template in 2 parts

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index a28ccfe36ab87ff2e1d6cb11876364b25edd6c87..45e22ae45cd67fff8f662b6cc3a1b76208d04ee3 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -5,6 +5,8 @@
 #include "os/os.h"
 #include "stat.h"
 #include "gettime.h"
+#include "lib/ieee754.h"
+#include "td_error.h"
 
 /*
  * What type of allocation to use for io buffers
@@ -17,26 +19,8 @@ enum fio_memtype {
        MEM_MMAPHUGE,   /* memory mapped huge file */
 };
 
-/*
- * What type of errors to continue on when continue_on_error is used
- */
-enum error_type_bit {
-       ERROR_TYPE_READ_BIT = 0,
-       ERROR_TYPE_WRITE_BIT = 1,
-       ERROR_TYPE_VERIFY_BIT = 2,
-       ERROR_TYPE_CNT = 3,
-};
-
 #define ERROR_STR_MAX  128
 
-enum error_type {
-        ERROR_TYPE_NONE = 0,
-        ERROR_TYPE_READ = 1 << ERROR_TYPE_READ_BIT,
-        ERROR_TYPE_WRITE = 1 << ERROR_TYPE_WRITE_BIT,
-        ERROR_TYPE_VERIFY = 1 << ERROR_TYPE_VERIFY_BIT,
-        ERROR_TYPE_ANY = 0xffff,
-};
-
 #define BSSPLIT_MAX    64
 
 struct bssplit {
@@ -50,12 +34,14 @@ struct thread_options {
        char *name;
        char *directory;
        char *filename;
+       char *filename_format;
        char *opendir;
        char *ioengine;
        char *mmapfile;
        enum td_ddir td_ddir;
        unsigned int rw_seq;
        unsigned int kb_base;
+       unsigned int unit_base;
        unsigned int ddir_seq_nr;
        long ddir_seq_add;
        unsigned int iodepth;
@@ -84,7 +70,6 @@ struct thread_options {
        unsigned int nr_files;
        unsigned int open_files;
        enum file_lock_mode file_lock_mode;
-       unsigned int lockfile_batch;
 
        unsigned int odirect;
        unsigned int invalidate_cache;
@@ -122,11 +107,14 @@ struct thread_options {
        unsigned int fsync_on_close;
 
        unsigned int random_distribution;
+
        fio_fp64_t zipf_theta;
        fio_fp64_t pareto_h;
 
        unsigned int random_generator;
 
+       unsigned int perc_rand;
+
        unsigned int hugepage_size;
        unsigned int rw_min_bs;
        unsigned int thinktime;
@@ -149,7 +137,7 @@ struct thread_options {
        enum fio_memtype mem_type;
        unsigned int mem_align;
 
-       unsigned max_latency;
+       unsigned int max_latency;
 
        unsigned int stonewall;
        unsigned int new_group;
@@ -258,12 +246,14 @@ struct thread_options_pack {
        uint8_t name[FIO_TOP_STR_MAX];
        uint8_t directory[FIO_TOP_STR_MAX];
        uint8_t filename[FIO_TOP_STR_MAX];
+       uint8_t filename_format[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;
+       uint32_t unit_base;
        uint32_t ddir_seq_nr;
        uint64_t ddir_seq_add;
        uint32_t iodepth;
@@ -292,7 +282,6 @@ struct thread_options_pack {
        uint32_t nr_files;
        uint32_t open_files;
        uint32_t file_lock_mode;
-       uint32_t lockfile_batch;
 
        uint32_t odirect;
        uint32_t invalidate_cache;
@@ -335,6 +324,8 @@ struct thread_options_pack {
 
        uint32_t random_generator;
 
+       uint32_t perc_rand;
+
        uint32_t hugepage_size;
        uint32_t rw_min_bs;
        uint32_t thinktime;