X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=4f30f2c1991aaf8769e2802d4dceef7cb0d83a34;hp=abd02c8c3b55055e4b73865182b0e5efa009e6f6;hb=cade3ef44669c5c962d7ed18ca0e361116ee44ad;hpb=214e1ecae844a32bf8f66d19132f4948d922dcee diff --git a/options.c b/options.c index abd02c8c..4f30f2c1 100644 --- a/options.c +++ b/options.c @@ -9,7 +9,7 @@ #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. @@ -27,13 +27,25 @@ static char *get_opt_postfix(const char *str) 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 = 0; + 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; } @@ -90,7 +102,7 @@ static int str_cpumask_cb(void *data, unsigned int *val) { struct thread_data *td = data; - fill_cpu_mask(td->cpumask, *val); + fill_cpu_mask(td->o.cpumask, *val); return 0; } @@ -117,13 +129,13 @@ static int str_filename_cb(void *data, const char *input) 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); @@ -135,13 +147,13 @@ static int str_directory_cb(void *data, const char fio_unused *str) 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; } @@ -153,9 +165,9 @@ static int str_opendir_cb(void *data, const char fio_unused *str) 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); } @@ -201,7 +213,9 @@ static struct fio_option options[] = { }, { .name = "rw", + .alias = "readwrite", .type = FIO_OPT_STR, + .cb = str_rw_cb, .off1 = td_var_offset(td_ddir), .help = "IO direction", .def = "read", @@ -232,6 +246,13 @@ 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, @@ -279,6 +300,11 @@ static struct fio_option options[] = { { .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)", }, @@ -306,7 +332,7 @@ static struct fio_option options[] = { { .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", }, { @@ -318,6 +344,7 @@ static struct fio_option options[] = { }, { .name = "bs", + .alias = "blocksize", .type = FIO_OPT_STR_VAL_INT, .off1 = td_var_offset(bs[DDIR_READ]), .off2 = td_var_offset(bs[DDIR_WRITE]), @@ -326,6 +353,7 @@ static struct fio_option options[] = { }, { .name = "bsrange", + .alias = "blocksize_range", .type = FIO_OPT_RANGE, .off1 = td_var_offset(min_bs[DDIR_READ]), .off2 = td_var_offset(max_bs[DDIR_READ]), @@ -335,6 +363,7 @@ static struct fio_option options[] = { }, { .name = "bs_unaligned", + .alias = "blocksize_unaligned", .type = FIO_OPT_STR_SET, .off1 = td_var_offset(bs_unaligned), .help = "Don't sector align IO buffer sizes", @@ -450,6 +479,7 @@ static struct fio_option options[] = { }, { .name = "mem", + .alias = "iomem", .type = FIO_OPT_STR, .cb = str_mem_cb, .off1 = td_var_offset(mem_type), @@ -566,7 +596,7 @@ static struct fio_option options[] = { { .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", @@ -574,7 +604,7 @@ static struct fio_option options[] = { { .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", @@ -637,7 +667,19 @@ static struct fio_option options[] = { .name = "ratemin", .type = FIO_OPT_INT, .off1 = td_var_offset(ratemin), - .help = "The bottom limit accepted", + .help = "Job must meet this rate or it will be shutdown", + }, + { + .name = "rate_iops", + .type = FIO_OPT_INT, + .off1 = td_var_offset(rate_iops), + .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), + .help = "Job must meet this rate or it will be shutdown", }, { .name = "ratecycle", @@ -735,6 +777,12 @@ static struct fio_option options[] = { .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,