td->ioprio &= mask;
td->ioprio |= *val << IOPRIO_CLASS_SHIFT;
+ td->ioprio_set = 1;
return 0;
}
if ((td->ioprio >> IOPRIO_CLASS_SHIFT) == 0)
td->ioprio |= IOPRIO_CLASS_BE << IOPRIO_CLASS_SHIFT;
+ td->ioprio_set = 1;
return 0;
}
#endif
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)
else
td->o.verify_pattern_bytes = 4;
- td->o.verify_pattern = *off;
+ td->o.verify_pattern = nr;
return 0;
}
},
},
},
- {
- .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,
{ .ival = "sync",
.help = "Use read/write",
},
+ { .ival = "psync",
+ .help = "Use pread/pwrite",
+ },
#ifdef FIO_HAVE_LIBAIO
{ .ival = "libaio",
.help = "Linux native asynchronous IO",
.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",
.minval = 1,
.help = "Block size unit",
.def = "4k",
+ .parent = "rw",
},
{
.name = "bsrange",
.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",
.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",
.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",
.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",
.name = "verify",
.type = FIO_OPT_STR,
.off1 = td_var_offset(verify),
+ .cb = str_verify_cb,
.help = "Verify data written",
.def = "0",
.posval = {
.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,
},
},
},
+ {
+ .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,
.off1 = td_var_offset(verifysort),
.help = "Sort written verify blocks for read back",
.def = "1",
+ .parent = "verify",
},
{
.name = "verify_interval",
.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",
.off1 = td_var_offset(sync_io),
.help = "Use O_SYNC for buffered writes",
.def = "0",
+ .parent = "buffered",
},
{
.name = "bwavgtime",
.off1 = td_var_offset(cpucycle),
.help = "Length of the CPU burn cycles (usecs)",
.def = "50000",
+ .parent = "cpuload",
},
#ifdef FIO_HAVE_CPU_AFFINITY
{