} else
perc = -1;
- if (str_to_decimal(fname, &val, 1)) {
+ if (str_to_decimal(fname, &val, 1, &td)) {
log_err("fio: bssplit conversion failed\n");
free(td->o.bssplit);
return 1;
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;
}
+/*
+ * Return next file in the string. Files are separated with ':'. If the ':'
+ * is escaped with a '\', then that ':' is part of the filename and does not
+ * indicate a new file.
+ */
+static char *get_next_file_name(char **ptr)
+{
+ char *str = *ptr;
+ char *p, *start;
+
+ if (!str || !strlen(str))
+ return NULL;
+
+ start = str;
+ do {
+ /*
+ * No colon, we are done
+ */
+ p = strchr(str, ':');
+ if (!p) {
+ *ptr = NULL;
+ break;
+ }
+
+ /*
+ * We got a colon, but it's the first character. Skip and
+ * continue
+ */
+ if (p == start) {
+ str = ++start;
+ continue;
+ }
+
+ if (*(p - 1) != '\\') {
+ *p = '\0';
+ *ptr = p + 1;
+ break;
+ }
+
+ memmove(p - 1, p, strlen(p) + 1);
+ str = p;
+ } while (1);
+
+ return start;
+}
+
static int str_filename_cb(void *data, const char *input)
{
struct thread_data *td = data;
if (!td->files_index)
td->o.nr_files = 0;
- while ((fname = strsep(&str, ":")) != NULL) {
+ while ((fname = get_next_file_name(&str)) != NULL) {
if (!strlen(fname))
break;
if (check_dir(td, fname)) {
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)
.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),
+ .verify = kb_base_verify,
+ .prio = 1,
+ .def = "1024",
+ .help = "How many bytes per KB for reporting (1000 or 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,
.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,
.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,
.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",
__options_mem(td, 0);
#endif
}
+
+unsigned int fio_get_kb_base(void *data)
+{
+ struct thread_data *td = data;
+ unsigned int kb_base = 0;
+
+ if (td)
+ kb_base = td->o.kb_base;
+ if (!kb_base)
+ kb_base = 1024;
+
+ return kb_base;
+}
projects / fio.git / blobdiff