'1' is minimum value for queue depth, don't allow 0

[fio.git] / options.c

diff --git a/options.c b/options.c
index 2fc414814d3e1ed719651bcb4389d4148b99a822..c56b9dfb63e8795e6b2dd623add21cb6c0c99a4e 100644 (file)
--- a/options.c
+++ b/options.c
@@ -74,6 +74,7 @@ static int str_prioclass_cb(void *data, unsigned int *val)
        td->ioprio &= mask;
 
        td->ioprio |= *val << IOPRIO_CLASS_SHIFT;
+       td->ioprio_set = 1;
        return 0;
 }
 
@@ -89,6 +90,7 @@ static int str_prio_cb(void *data, unsigned int *val)
        if ((td->ioprio >> IOPRIO_CLASS_SHIFT) == 0)
                td->ioprio |= IOPRIO_CLASS_BE << IOPRIO_CLASS_SHIFT;
 
+       td->ioprio_set = 1;
        return 0;
 }
 #endif
@@ -217,12 +219,27 @@ static int str_verify_offset_cb(void *data, unsigned int *off)
        return 0;
 }
 
-static int str_verify_pattern_cb(void *data, unsigned int *off)
+static int str_verify_cb(void *data, const char *mem)
 {
        struct thread_data *td = data;
-       unsigned int msb;
+       unsigned int nr, msb;
+       char *pat;
 
-       msb = fls(*off);
+       if (td->o.verify != VERIFY_PATTERN)
+               return 0;
+
+       pat = get_opt_postfix(mem);
+       if (!pat) {
+               log_err("fio: missing pattern\n");
+               return 1;
+       }
+
+       if (strstr(pat, "0x") || strstr(pat, "0X"))
+               nr = strtol(pat, NULL, 16);
+       else
+               nr = strtol(pat, NULL, 16);
+
+       msb = fls(nr);
        if (msb <= 8)
                td->o.verify_pattern_bytes = 1;
        else if (msb <= 16)
@@ -232,7 +249,7 @@ static int str_verify_pattern_cb(void *data, unsigned int *off)
        else
                td->o.verify_pattern_bytes = 4;
 
-       td->o.verify_pattern = *off;
+       td->o.verify_pattern = nr;
        return 0;
 }
 
@@ -311,13 +328,6 @@ static struct fio_option options[] = {
                          },
                },
        },
-       {
-               .name   = "fadvise_hint",
-               .type   = FIO_OPT_BOOL,
-               .off1   = td_var_offset(fadvise_hint),
-               .help   = "Use fadvise() to advise the kernel on IO pattern",
-               .def    = "1",
-       },
        {
                .name   = "ioengine",
                .type   = FIO_OPT_STR_STORE,
@@ -328,6 +338,9 @@ static struct fio_option options[] = {
                          { .ival = "sync",
                            .help = "Use read/write",
                          },
+                         { .ival = "psync",
+                           .help = "Use pread/pwrite",
+                         },
 #ifdef FIO_HAVE_LIBAIO
                          { .ival = "libaio",
                            .help = "Linux native asynchronous IO",
@@ -383,6 +396,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(iodepth),
                .help   = "Amount of IO buffers to keep in flight",
+               .minval = 1,
                .def    = "1",
        },
        {
@@ -414,6 +428,14 @@ static struct fio_option options[] = {
                .minval = 1,
                .help   = "Size of individual files",
        },
+       {
+               .name   = "offset",
+               .alias  = "fileoffset",
+               .type   = FIO_OPT_STR_VAL,
+               .off1   = td_var_offset(start_offset),
+               .help   = "Start IO from this offset",
+               .def    = "0",
+       },
        {
                .name   = "bs",
                .alias  = "blocksize",
@@ -423,6 +445,7 @@ static struct fio_option options[] = {
                .minval = 1,
                .help   = "Block size unit",
                .def    = "4k",
+               .parent = "rw",
        },
        {
                .name   = "bsrange",
@@ -434,6 +457,7 @@ static struct fio_option options[] = {
                .off4   = td_var_offset(max_bs[DDIR_WRITE]),
                .minval = 1,
                .help   = "Set block size range (in more detail than bs)",
+               .parent = "rw",
        },
        {
                .name   = "bs_unaligned",
@@ -441,13 +465,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_STR_SET,
                .off1   = td_var_offset(bs_unaligned),
                .help   = "Don't sector align IO buffer sizes",
-       },
-       {
-               .name   = "offset",
-               .type   = FIO_OPT_STR_VAL,
-               .off1   = td_var_offset(start_offset),
-               .help   = "Start IO from this offset",
-               .def    = "0",
+               .parent = "rw",
        },
        {
                .name   = "randrepeat",
@@ -455,12 +473,14 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(rand_repeatable),
                .help   = "Use repeatable random IO pattern",
                .def    = "1",
+               .parent = "rw",
        },
        {
                .name   = "norandommap",
                .type   = FIO_OPT_STR_SET,
                .off1   = td_var_offset(norandommap),
                .help   = "Accept potential duplicate random blocks",
+               .parent = "rw",
        },
        {
                .name   = "nrfiles",
@@ -492,6 +512,14 @@ static struct fio_option options[] = {
                            .help = "Round robin select files",
                          },
                },
+               .parent = "nrfiles",
+       },
+       {
+               .name   = "fadvise_hint",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(fadvise_hint),
+               .help   = "Use fadvise() to advise the kernel on IO pattern",
+               .def    = "1",
        },
        {
                .name   = "fsync",
@@ -596,6 +624,7 @@ static struct fio_option options[] = {
                .name   = "verify",
                .type   = FIO_OPT_STR,
                .off1   = td_var_offset(verify),
+               .cb     = str_verify_cb,
                .help   = "Verify data written",
                .def    = "0",
                .posval = {
@@ -631,6 +660,14 @@ static struct fio_option options[] = {
                            .oval = VERIFY_SHA512,
                            .help = "Use sha512 checksums for verification",
                          },
+                         { .ival = "meta",
+                           .oval = VERIFY_META,
+                           .help = "Use io information",
+                         },
+                         { .ival = "pattern",
+                           .oval = VERIFY_PATTERN,
+                           .help = "Verify a specific buffer pattern",
+                         },
                          {
                            .ival = "null",
                            .oval = VERIFY_NULL,
@@ -638,6 +675,14 @@ static struct fio_option options[] = {
                          },
                },
        },
+       {
+               .name   = "do_verify",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(do_verify),
+               .help   = "Run verification stage after write",
+               .def    = "1",
+               .parent = "verify",
+       },
        {
                .name   = "verifysort",
                .type   = FIO_OPT_BOOL,
@@ -663,11 +708,12 @@ static struct fio_option options[] = {
                .parent = "verify",
        },
        {
-               .name   = "verify_pattern",
-               .type   = FIO_OPT_INT,
-               .cb     = str_verify_pattern_cb,
-               .help   = "Fill pattern for IO buffers",
-               .parent = "verify",
+               .name   = "verify_fatal",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(verify_fatal),
+               .def    = "0",
+               .help   = "Exit on a single verify failure, don't continue",
+               .parent = "verify",
        },
        {
                .name   = "write_iolog",
@@ -843,6 +889,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(sync_io),
                .help   = "Use O_SYNC for buffered writes",
                .def    = "0",
+               .parent = "buffered",
        },
        {
                .name   = "bwavgtime",
@@ -877,6 +924,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(cpucycle),
                .help   = "Length of the CPU burn cycles (usecs)",
                .def    = "50000",
+               .parent = "cpuload",
        },
 #ifdef FIO_HAVE_CPU_AFFINITY
        {