Merge branch 'master' into gfio

[fio.git] / thread_options.h

diff --git a/thread_options.h b/thread_options.h
index d577f6176977e1dc104fa514fdadc396d5808a1c..68056dfb3475f18a82b459576b44d95408882cc2 100644 (file)
--- a/thread_options.h
+++ b/thread_options.h
@@ -50,12 +50,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;
@@ -121,6 +123,7 @@ struct thread_options {
        unsigned int fsync_on_close;
 
        unsigned int random_distribution;
+
        fio_fp64_t zipf_theta;
        fio_fp64_t pareto_h;
 
@@ -148,7 +151,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;
@@ -257,12 +260,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;