Add parent link to options

[fio.git] / options.c

diff --git a/options.c b/options.c
index cf42a6da83f1114f202f148e4a7722c25726435e..7f4ed2db994b9a6d1b2ccbf003b3ac81277e018e 100644 (file)
--- a/options.c
+++ b/options.c
@@ -8,6 +8,7 @@
 
 #include "fio.h"
 #include "parse.h"
+#include "fls.h"
 
 #define td_var_offset(var)     ((size_t) &((struct thread_options *)0)->var)
 
@@ -203,6 +204,37 @@ static int str_opendir_cb(void *data, const char fio_unused *str)
        return add_dir_files(td, td->o.opendir);
 }
 
+static int str_verify_offset_cb(void *data, unsigned int *off)
+{
+       struct thread_data *td = data;
+
+       if (*off && *off < sizeof(struct verify_header)) {
+               log_err("fio: verify_offset too small\n");
+               return 1;
+       }
+
+       td->o.verify_offset = *off;
+       return 0;
+}
+
+static int str_verify_pattern_cb(void *data, unsigned int *off)
+{
+       struct thread_data *td = data;
+       unsigned int msb;
+
+       msb = fls(*off);
+       if (msb <= 8)
+               td->o.verify_pattern_bytes = 1;
+       else if (msb <= 16)
+               td->o.verify_pattern_bytes = 2;
+       else if (msb <= 24)
+               td->o.verify_pattern_bytes = 3;
+       else
+               td->o.verify_pattern_bytes = 4;
+
+       td->o.verify_pattern = *off;
+       return 0;
+}
 
 #define __stringify_1(x)       #x
 #define __stringify(x)         __stringify_1(x)
@@ -358,12 +390,14 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(iodepth_batch),
                .help   = "Number of IO to submit in one go",
+               .parent = "iodepth",
        },
        {
                .name   = "iodepth_low",
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(iodepth_low),
                .help   = "Low water mark for queuing depth",
+               .parent = "iodepth",
        },
        {
                .name   = "size",
@@ -569,6 +603,14 @@ static struct fio_option options[] = {
                            .oval = VERIFY_NONE,
                            .help = "Don't do IO verification",
                          },
+                         { .ival = "md5",
+                           .oval = VERIFY_MD5,
+                           .help = "Use md5 checksums for verification",
+                         },
+                         { .ival = "crc64",
+                           .oval = VERIFY_CRC64,
+                           .help = "Use crc64 checksums for verification",
+                         },
                          { .ival = "crc32",
                            .oval = VERIFY_CRC32,
                            .help = "Use crc32 checksums for verification",
@@ -577,9 +619,17 @@ static struct fio_option options[] = {
                            .oval = VERIFY_CRC16,
                            .help = "Use crc16 checksums for verification",
                          },
-                         { .ival = "md5",
-                           .oval = VERIFY_MD5,
-                           .help = "Use md5 checksums for verification",
+                         { .ival = "crc7",
+                           .oval = VERIFY_CRC7,
+                           .help = "Use crc7 checksums for verification",
+                         },
+                         { .ival = "sha256",
+                           .oval = VERIFY_SHA256,
+                           .help = "Use sha256 checksums for verification",
+                         },
+                         { .ival = "sha512",
+                           .oval = VERIFY_SHA512,
+                           .help = "Use sha512 checksums for verification",
                          },
                          {
                            .ival = "null",
@@ -595,6 +645,29 @@ static struct fio_option options[] = {
                .help   = "Sort written verify blocks for read back",
                .def    = "1",
        },
+       {
+               .name   = "verify_interval",
+               .type   = FIO_OPT_STR_VAL_INT,
+               .off1   = td_var_offset(verify_interval),
+               .minval = 2 * sizeof(struct verify_header),
+               .help   = "Store verify buffer header every N bytes",
+               .parent = "verify",
+       },
+       {
+               .name   = "verify_offset",
+               .type   = FIO_OPT_STR_VAL_INT,
+               .help   = "Offset verify header location by N bytes",
+               .def    = "0",
+               .cb     = str_verify_offset_cb, 
+               .parent = "verify",
+       },
+       {
+               .name   = "verify_pattern",
+               .type   = FIO_OPT_INT,
+               .cb     = str_verify_pattern_cb,
+               .help   = "Fill pattern for IO buffers",
+               .parent = "verify",
+       },
        {
                .name   = "write_iolog",
                .type   = FIO_OPT_STR_STORE,
@@ -648,13 +721,6 @@ static struct fio_option options[] = {
                .help   = "Lock down this amount of memory",
                .def    = "0",
        },
-       {
-               .name   = "rwmixcycle",
-               .type   = FIO_OPT_INT,
-               .off1   = td_var_offset(rwmixcycle),
-               .help   = "Cycle period for mixed read/write workloads (msec)",
-               .def    = "500",
-       },
        {
                .name   = "rwmixread",
                .type   = FIO_OPT_INT,
@@ -671,6 +737,14 @@ static struct fio_option options[] = {
                .help   = "Percentage of mixed workload that is writes",
                .def    = "50",
        },
+       {
+               .name   = "rwmixcycle",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(rwmixcycle),
+               .help   = "Cycle period for mixed read/write workloads (msec)",
+               .def    = "500",
+               .parent = "rwmixread",
+       },
        {
                .name   = "nice",
                .type   = FIO_OPT_INT,
@@ -711,6 +785,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(thinktime_spin),
                .help   = "Start think time by spinning this amount (usec)",
                .def    = "0",
+               .parent = "thinktime",
        },
        {
                .name   = "thinktime_blocks",
@@ -718,6 +793,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(thinktime_blocks),
                .help   = "IO buffer period between 'thinktime'",
                .def    = "1",
+               .parent = "thinktime",
        },
        {
                .name   = "rate",
@@ -730,6 +806,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(ratemin),
                .help   = "Job must meet this rate or it will be shutdown",
+               .parent = "rate",
        },
        {
                .name   = "rate_iops",
@@ -742,6 +819,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(rate_iops_min),
                .help   = "Job must meet this rate or it will be shutdown",
+               .parent = "rate_iops",
        },
        {
                .name   = "ratecycle",
@@ -749,6 +827,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(ratecycle),
                .help   = "Window average for rate limits (msec)",
                .def    = "1000",
+               .parent = "rate",
        },
        {
                .name   = "invalidate",