#include <sys/stat.h>
#include "fio.h"
+#include "verify.h"
#include "parse.h"
#include "lib/fls.h"
return 0;
}
-static int str_cpus_allowed_cb(void *data, const char *input)
+static int set_cpus_allowed(struct thread_data *td, os_cpu_mask_t *mask,
+ const char *input)
{
- struct thread_data *td = data;
char *cpu, *str, *p;
long max_cpu;
int ret = 0;
- ret = fio_cpuset_init(&td->o.cpumask);
+ ret = fio_cpuset_init(mask);
if (ret < 0) {
log_err("fio: cpuset_init failed\n");
td_verror(td, ret, "fio_cpuset_init");
}
dprint(FD_PARSE, "set cpu allowed %d\n", icpu);
- fio_cpu_set(&td->o.cpumask, icpu);
+ fio_cpu_set(mask, icpu);
icpu++;
}
if (ret)
td->o.cpumask_set = 1;
return ret;
}
+
+static int str_cpus_allowed_cb(void *data, const char *input)
+{
+ struct thread_data *td = data;
+ int ret;
+
+ ret = set_cpus_allowed(td, &td->o.cpumask, input);
+ if (!ret)
+ td->o.cpumask_set = 1;
+
+ return ret;
+}
+
+static int str_verify_cpus_allowed_cb(void *data, const char *input)
+{
+ struct thread_data *td = data;
+ int ret;
+
+ ret = set_cpus_allowed(td, &td->o.verify_cpumask, input);
+ if (!ret)
+ td->o.verify_cpumask_set = 1;
+
+ return ret;
+}
#endif
static int str_fst_cb(void *data, const char *str)
return 0;
}
+static int rw_verify(struct fio_option *o, void *data)
+{
+ struct thread_data *td = data;
+
+ if (read_only && td_write(td)) {
+ log_err("fio: job <%s> has write bit set, but fio is in"
+ " read-only mode\n", td->o.name);
+ return 1;
+ }
+
+ return 0;
+}
+
+static int gtod_cpu_verify(struct fio_option *o, void *data)
+{
+#ifndef FIO_HAVE_CPU_AFFINITY
+ struct thread_data *td = data;
+
+ if (td->o.gtod_cpu) {
+ log_err("fio: platform must support CPU affinity for"
+ "gettimeofday() offloading\n");
+ return 1;
+ }
+#endif
+
+ return 0;
+}
+
+static int kb_base_verify(struct fio_option *o, void *data)
+{
+ struct thread_data *td = data;
+
+ if (td->o.kb_base != 1024 && td->o.kb_base != 1000) {
+ log_err("fio: kb_base set to nonsensical value: %u\n",
+ td->o.kb_base);
+ return 1;
+ }
+
+ return 0;
+}
+
#define __stringify_1(x) #x
#define __stringify(x) __stringify_1(x)
.type = FIO_OPT_STR_STORE,
.off1 = td_var_offset(filename),
.cb = str_filename_cb,
- .prio = 1, /* must come before "directory" */
+ .prio = -1, /* must come after "directory" */
.help = "File(s) to use for the workload",
},
+ {
+ .name = "kb_base",
+ .type = FIO_OPT_INT,
+ .off1 = td_var_offset(kb_base),
+ .help = "How many bytes per KB for reporting (1000 or 1024)",
+ .verify = kb_base_verify,
+ .def = "1024",
+ },
{
.name = "lockfile",
.type = FIO_OPT_STR,
.off1 = td_var_offset(td_ddir),
.help = "IO direction",
.def = "read",
+ .verify = rw_verify,
.posval = {
{ .ival = "read",
.oval = TD_DDIR_READ,
{
.name = "bs",
.alias = "blocksize",
- .type = FIO_OPT_STR_VAL_INT,
+ .type = FIO_OPT_INT,
.off1 = td_var_offset(bs[DDIR_READ]),
.off2 = td_var_offset(bs[DDIR_WRITE]),
.minval = 1,
{
.name = "ba",
.alias = "blockalign",
- .type = FIO_OPT_STR_VAL_INT,
+ .type = FIO_OPT_INT,
.off1 = td_var_offset(ba[DDIR_READ]),
.off2 = td_var_offset(ba[DDIR_WRITE]),
.minval = 1,
.help = "Issue fsync for writes every given number of blocks",
.def = "0",
},
+ {
+ .name = "fdatasync",
+ .type = FIO_OPT_INT,
+ .off1 = td_var_offset(fdatasync_blocks),
+ .help = "Issue fdatasync for writes every given number of blocks",
+ .def = "0",
+ },
{
.name = "direct",
.type = FIO_OPT_BOOL,
#endif
},
},
+ {
+ .name = "iomem_align",
+ .alias = "mem_align",
+ .type = FIO_OPT_INT,
+ .off1 = td_var_offset(mem_align),
+ .minval = 0,
+ .help = "IO memory buffer offset alignment",
+ .def = "0",
+ .parent = "iomem",
+ },
{
.name = "verify",
.type = FIO_OPT_STR,
},
{
.name = "verify_interval",
- .type = FIO_OPT_STR_VAL_INT,
+ .type = FIO_OPT_INT,
.off1 = td_var_offset(verify_interval),
.minval = 2 * sizeof(struct verify_header),
.help = "Store verify buffer header every N bytes",
},
{
.name = "verify_offset",
- .type = FIO_OPT_STR_VAL_INT,
+ .type = FIO_OPT_INT,
.help = "Offset verify header location by N bytes",
.def = "0",
.cb = str_verify_offset_cb,
.help = "Exit on a single verify failure, don't continue",
.parent = "verify",
},
+ {
+ .name = "verify_async",
+ .type = FIO_OPT_INT,
+ .off1 = td_var_offset(verify_async),
+ .def = "0",
+ .help = "Number of async verifier threads to use",
+ .parent = "verify",
+ },
+#ifdef FIO_HAVE_CPU_AFFINITY
+ {
+ .name = "verify_async_cpus",
+ .type = FIO_OPT_STR,
+ .cb = str_verify_cpus_allowed_cb,
+ .help = "Set CPUs allowed for async verify threads",
+ .parent = "verify_async",
+ },
+#endif
{
.name = "write_iolog",
.type = FIO_OPT_STR_STORE,
{
.name = "rate",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(rate),
+ .off1 = td_var_offset(rate[0]),
+ .off2 = td_var_offset(rate[1]),
.help = "Set bandwidth rate",
},
{
.name = "ratemin",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(ratemin),
+ .off1 = td_var_offset(ratemin[0]),
+ .off2 = td_var_offset(ratemin[1]),
.help = "Job must meet this rate or it will be shutdown",
.parent = "rate",
},
{
.name = "rate_iops",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(rate_iops),
+ .off1 = td_var_offset(rate_iops[0]),
+ .off2 = td_var_offset(rate_iops[1]),
.help = "Limit IO used to this number of IO operations/sec",
},
{
.name = "rate_iops_min",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(rate_iops_min),
+ .off1 = td_var_offset(rate_iops_min[0]),
+ .off2 = td_var_offset(rate_iops_min[1]),
.help = "Job must meet this rate or it will be shutdown",
.parent = "rate_iops",
},
.help = "Create files when they are opened for IO",
.def = "0",
},
+ {
+ .name = "pre_read",
+ .type = FIO_OPT_BOOL,
+ .off1 = td_var_offset(pre_read),
+ .help = "Preread files before starting official testing",
+ .def = "0",
+ },
{
.name = "cpuload",
.type = FIO_OPT_INT,
},
{
.name = "hugepage-size",
- .type = FIO_OPT_STR_VAL_INT,
+ .type = FIO_OPT_INT,
.off1 = td_var_offset(hugepage_size),
.help = "When using hugepages, specify size of each page",
.def = __stringify(FIO_HUGE_PAGE),
.type = FIO_OPT_INT,
.cb = str_gtod_cpu_cb,
.help = "Setup dedicated gettimeofday() thread on this CPU",
+ .verify = gtod_cpu_verify,
+ },
+ {
+ .name = "continue_on_error",
+ .type = FIO_OPT_BOOL,
+ .off1 = td_var_offset(continue_on_error),
+ .help = "Continue on non-fatal errors during I/O",
+ .def = "0",
},
{
.name = NULL,
projects / fio.git / blobdiff