#include "fio.h"
#include "parse.h"
-#define td_var_offset(var) ((size_t) &((struct thread_data *)0)->var)
+#define td_var_offset(var) ((size_t) &((struct thread_options *)0)->var)
/*
* Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that.
return strdup(p);
}
+static int str_rw_cb(void *data, const char *str)
+{
+ struct thread_data *td = data;
+ char *nr = get_opt_postfix(str);
+
+ td->o.ddir_nr = 1;
+ if (nr)
+ td->o.ddir_nr = atoi(nr);
+
+ return 0;
+}
+
static int str_mem_cb(void *data, const char *mem)
{
struct thread_data *td = data;
- if (td->mem_type == MEM_MMAPHUGE || td->mem_type == MEM_MMAP) {
+ if (td->o.mem_type == MEM_MMAPHUGE || td->o.mem_type == MEM_MMAP) {
td->mmapfile = get_opt_postfix(mem);
- if (td->mem_type == MEM_MMAPHUGE && !td->mmapfile) {
+ if (td->o.mem_type == MEM_MMAPHUGE && !td->mmapfile) {
log_err("fio: mmaphuge:/path/to/file\n");
return 1;
}
static int str_prioclass_cb(void *data, unsigned int *val)
{
struct thread_data *td = data;
+ unsigned short mask;
+
+ /*
+ * mask off old class bits, str_prio_cb() may have set a default class
+ */
+ mask = (1 << IOPRIO_CLASS_SHIFT) - 1;
+ td->ioprio &= mask;
td->ioprio |= *val << IOPRIO_CLASS_SHIFT;
return 0;
struct thread_data *td = data;
td->ioprio |= *val;
+
+ /*
+ * If no class is set, assume BE
+ */
+ if ((td->ioprio >> IOPRIO_CLASS_SHIFT) == 0)
+ td->ioprio |= IOPRIO_CLASS_BE << IOPRIO_CLASS_SHIFT;
+
return 0;
}
#endif
{
struct thread_data *td = data;
- fill_cpu_mask(td->cpumask, *val);
+ fill_cpu_mask(td->o.cpumask, *val);
+ td->o.cpumask_set = 1;
return 0;
}
strip_blank_end(str);
if (!td->files_index)
- td->nr_files = 0;
+ td->o.nr_files = 0;
while ((fname = strsep(&str, ":")) != NULL) {
if (!strlen(fname))
break;
add_file(td, fname);
- td->nr_files++;
+ td->o.nr_files++;
}
free(p);
struct thread_data *td = data;
struct stat sb;
- if (lstat(td->directory, &sb) < 0) {
- log_err("fio: %s is not a directory\n", td->directory);
+ if (lstat(td->o.directory, &sb) < 0) {
+ log_err("fio: %s is not a directory\n", td->o.directory);
td_verror(td, errno, "lstat");
return 1;
}
if (!S_ISDIR(sb.st_mode)) {
- log_err("fio: %s is not a directory\n", td->directory);
+ log_err("fio: %s is not a directory\n", td->o.directory);
return 1;
}
struct thread_data *td = data;
if (!td->files_index)
- td->nr_files = 0;
+ td->o.nr_files = 0;
- return add_dir_files(td, td->opendir);
+ return add_dir_files(td, td->o.opendir);
}
.name = "rw",
.alias = "readwrite",
.type = FIO_OPT_STR,
+ .cb = str_rw_cb,
.off1 = td_var_offset(td_ddir),
.help = "IO direction",
.def = "read",
},
},
},
+ {
+ .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 = "cpuio",
.help = "CPU cycler burner engine",
},
+#ifdef FIO_HAVE_GUASI
+ { .ival = "guasi",
+ .help = "GUASI IO engine",
+ },
+#endif
{ .ival = "external",
.help = "Load external engine (append name)",
},
{
.name = "size",
.type = FIO_OPT_STR_VAL,
- .off1 = td_var_offset(total_file_size),
+ .off1 = td_var_offset(size),
.help = "Total size of device or files",
},
{
.help = "Stop workload when this amount of time has passed",
.def = "0",
},
+ {
+ .name = "time_based",
+ .type = FIO_OPT_STR_SET,
+ .off1 = td_var_offset(time_based),
+ .help = "Keep running until runtime/timeout is met",
+ },
{
.name = "mem",
.alias = "iomem",
.oval = VERIFY_MD5,
.help = "Use md5 checksums for verification",
},
+ {
+ .ival = "null",
+ .oval = VERIFY_NULL,
+ .help = "Pretend to verify",
+ },
},
},
+ {
+ .name = "verifysort",
+ .type = FIO_OPT_BOOL,
+ .off1 = td_var_offset(verifysort),
+ .help = "Sort written verify blocks for read back",
+ .def = "1",
+ },
{
.name = "write_iolog",
.type = FIO_OPT_STR_STORE,
{
.name = "rwmixread",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(rwmixread),
+ .off1 = td_var_offset(rwmix[DDIR_READ]),
.maxval = 100,
.help = "Percentage of mixed workload that is reads",
.def = "50",
{
.name = "rwmixwrite",
.type = FIO_OPT_INT,
- .off1 = td_var_offset(rwmixwrite),
+ .off1 = td_var_offset(rwmix[DDIR_WRITE]),
.maxval = 100,
.help = "Percentage of mixed workload that is writes",
.def = "50",
.off1 = td_var_offset(stonewall),
.help = "Insert a hard barrier between this job and previous",
},
+ {
+ .name = "new_group",
+ .type = FIO_OPT_STR_SET,
+ .off1 = td_var_offset(new_group),
+ .help = "Mark the start of a new group (for reporting)",
+ },
{
.name = "thread",
.type = FIO_OPT_STR_SET,
.off1 = td_var_offset(group_reporting),
.help = "Do reporting on a per-group basis",
},
+ {
+ .name = "zero_buffers",
+ .type = FIO_OPT_STR_SET,
+ .off1 = td_var_offset(zero_buffers),
+ .help = "Init IO buffers to all zeroes",
+ },
+#ifdef FIO_HAVE_DISK_UTIL
+ {
+ .name = "disk_util",
+ .type = FIO_OPT_BOOL,
+ .off1 = td_var_offset(do_disk_util),
+ .help = "Log disk utilization stats",
+ .def = "1",
+ },
+#endif
{
.name = NULL,
},
{
return show_cmd_help(options, opt);
}
+
+static void __options_mem(struct thread_data *td, int alloc)
+{
+ struct thread_options *o = &td->o;
+ struct fio_option *opt;
+ char **ptr;
+ int i;
+
+ for (i = 0, opt = &options[0]; opt->name; i++, opt = &options[i]) {
+ if (opt->type != FIO_OPT_STR_STORE)
+ continue;
+
+ ptr = (void *) o + opt->off1;
+ if (*ptr) {
+ if (alloc)
+ *ptr = strdup(*ptr);
+ else {
+ free(*ptr);
+ *ptr = NULL;
+ }
+ }
+ }
+}
+
+/*
+ * dupe FIO_OPT_STR_STORE options
+ */
+void options_mem_dupe(struct thread_data *td)
+{
+ __options_mem(td, 1);
+}
+
+void options_mem_free(struct thread_data fio_unused *td)
+{
+#if 0
+ __options_mem(td, 0);
+#endif
+}
projects / fio.git / blobdiff