X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=5252477b6e0756888d6cc3bd42b8dcdc5b492e4b;hp=ae5bcc5bca06f409132b474e11555dce5c0f8c1f;hb=e3567067a65eb29c721abe899ef431f768375fab;hpb=d9a7ba88af39b1047c9f8c077280932cd12cb58e diff --git a/options.c b/options.c index ae5bcc5b..5252477b 100644 --- a/options.c +++ b/options.c @@ -203,14 +203,44 @@ static int str_rw_cb(void *data, const char *str) char *nr = get_opt_postfix(str); td->o.ddir_seq_nr = 1; - if (nr) { + td->o.ddir_seq_add = 0; + + if (!nr) + return 0; + + if (td_random(td)) td->o.ddir_seq_nr = atoi(nr); - free(nr); + else { + long long val; + + if (str_to_decimal(nr, &val, 1, td)) { + log_err("fio: rw postfix parsing failed\n"); + free(nr); + return 1; + } + + td->o.ddir_seq_add = val; } + free(nr); return 0; } +#ifdef FIO_HAVE_LIBAIO +static int str_libaio_cb(void *data, const char *str) +{ + struct thread_data *td = data; + + if (!strcmp(str, "userspace_reap")) { + td->o.userspace_libaio_reap = 1; + return 0; + } + + log_err("fio: bad libaio sub-option: %s\n", str); + return 1; +} +#endif + static int str_mem_cb(void *data, const char *mem) { struct thread_data *td = data; @@ -329,7 +359,7 @@ static int str_cpumask_cb(void *data, unsigned long long *val) return 1; } - max_cpu = sysconf(_SC_NPROCESSORS_ONLN); + max_cpu = cpus_online(); for (i = 0; i < sizeof(int) * 8; i++) { if ((1 << i) & *val) { @@ -366,7 +396,7 @@ static int set_cpus_allowed(struct thread_data *td, os_cpu_mask_t *mask, strip_blank_front(&str); strip_blank_end(str); - max_cpu = sysconf(_SC_NPROCESSORS_ONLN); + max_cpu = cpus_online(); while ((cpu = strsep(&str, ",")) != NULL) { char *str2, *cpu2; @@ -482,6 +512,7 @@ static int str_sfr_cb(void *data, const char *str) static int check_dir(struct thread_data *td, char *fname) { +#if 0 char file[PATH_MAX], *dir; int elen = 0; @@ -494,7 +525,6 @@ static int check_dir(struct thread_data *td, char *fname) sprintf(file + elen, "%s", fname); dir = dirname(file); -#if 0 { struct stat sb; /* @@ -675,6 +705,11 @@ static int str_verify_pattern_cb(void *data, const char *input) } } td->o.verify_pattern_bytes = i; + /* + * VERIFY_META could already be set + */ + if (td->o.verify == VERIFY_NONE) + td->o.verify = VERIFY_PATTERN; return 0; } @@ -739,6 +774,20 @@ static int str_gtod_cpu_cb(void *data, long long *il) return 0; } +static int str_size_cb(void *data, unsigned long long *__val) +{ + struct thread_data *td = data; + unsigned long long v = *__val; + + if (parse_is_percent(v)) { + td->o.size = 0; + td->o.size_percent = -1ULL - v; + } else + td->o.size = v; + + return 0; +} + static int rw_verify(struct fio_option *o, void *data) { struct thread_data *td = data; @@ -913,7 +962,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(ioengine), .help = "IO engine to use", - .def = "sync", + .def = FIO_PREFERRED_ENGINE, .posval = { { .ival = "sync", .help = "Use read/write", @@ -927,6 +976,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { #ifdef FIO_HAVE_LIBAIO { .ival = "libaio", .help = "Linux native asynchronous IO", + .cb = str_libaio_cb, }, #endif #ifdef FIO_HAVE_POSIXAIO @@ -941,12 +991,12 @@ static struct fio_option options[FIO_MAX_OPTS] = { #endif #ifdef FIO_HAVE_WINDOWSAIO { .ival = "windowsaio", - .help = "Windows native asynchronous IO" + .help = "Windows native asynchronous IO" }, +#endif { .ival = "mmap", .help = "Memory mapped IO" }, -#endif #ifdef FIO_HAVE_SPLICE { .ival = "splice", .help = "splice/vmsplice based IO", @@ -983,6 +1033,11 @@ static struct fio_option options[FIO_MAX_OPTS] = { { .ival = "binject", .help = "binject direct inject block engine", }, +#endif +#ifdef FIO_HAVE_RDMA + { .ival = "rdma", + .help = "RDMA IO engine", + }, #endif { .ival = "external", .help = "Load external engine (append name)", @@ -1026,12 +1081,12 @@ static struct fio_option options[FIO_MAX_OPTS] = { { .name = "size", .type = FIO_OPT_STR_VAL, - .off1 = td_var_offset(size), - .minval = 1, + .cb = str_size_cb, .help = "Total size of device or files", }, { .name = "fill_device", + .alias = "fill_fs", .type = FIO_OPT_BOOL, .off1 = td_var_offset(fill_device), .help = "Write until an ENOSPC error occurs", @@ -1109,6 +1164,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { .def = "1", .parent = "rw", }, + { + .name = "use_os_rand", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(use_os_rand), + .help = "Set to use OS random generator", + .def = "0", + .parent = "rw", + }, { .name = "norandommap", .type = FIO_OPT_STR_SET, @@ -1164,12 +1227,37 @@ static struct fio_option options[FIO_MAX_OPTS] = { #ifdef FIO_HAVE_FALLOCATE { .name = "fallocate", - .type = FIO_OPT_BOOL, - .off1 = td_var_offset(fallocate), - .help = "Use fallocate() when laying out files", - .def = "1", - }, + .type = FIO_OPT_STR, + .off1 = td_var_offset(fallocate_mode), + .help = "Whether pre-allocation is performed when laying out files", + .def = "posix", + .posval = { + { .ival = "none", + .oval = FIO_FALLOCATE_NONE, + .help = "Do not pre-allocate space", + }, + { .ival = "posix", + .oval = FIO_FALLOCATE_POSIX, + .help = "Use posix_fallocate()", + }, +#ifdef FIO_HAVE_LINUX_FALLOCATE + { .ival = "keep", + .oval = FIO_FALLOCATE_KEEP_SIZE, + .help = "Use fallocate(..., FALLOC_FL_KEEP_SIZE, ...)", + }, #endif + /* Compatibility with former boolean values */ + { .ival = "0", + .oval = FIO_FALLOCATE_NONE, + .help = "Alias for 'none'", + }, + { .ival = "1", + .oval = FIO_FALLOCATE_POSIX, + .help = "Alias for 'posix'", + }, + }, + }, +#endif /* FIO_HAVE_FALLOCATE */ { .name = "fadvise_hint", .type = FIO_OPT_BOOL, @@ -1466,6 +1554,14 @@ static struct fio_option options[FIO_MAX_OPTS] = { .help = "Exit on a single verify failure, don't continue", .parent = "verify", }, + { + .name = "verify_dump", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(verify_dump), + .def = "1", + .help = "Dump contents of good and bad blocks on failure", + .parent = "verify", + }, { .name = "verify_async", .type = FIO_OPT_INT, @@ -1814,6 +1910,7 @@ static struct fio_option options[FIO_MAX_OPTS] = { }, { .name = "stonewall", + .alias = "wait_for_previous", .type = FIO_OPT_STR_SET, .off1 = td_var_offset(stonewall), .help = "Insert a hard barrier between this job and previous", @@ -1869,6 +1966,31 @@ static struct fio_option options[FIO_MAX_OPTS] = { .off1 = td_var_offset(refill_buffers), .help = "Refill IO buffers on every IO submit", }, + { + .name = "scramble_buffers", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(scramble_buffers), + .help = "Slightly scramble buffers on every IO submit", + .def = "1", + }, + { + .name = "clat_percentiles", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(clat_percentiles), + .help = "Enable the reporting of completion latency percentiles", + .def = "0", + }, + { + .name = "percentile_list", + .type = FIO_OPT_FLOAT_LIST, + .off1 = td_var_offset(percentile_list), + .off2 = td_var_offset(overwrite_plist), + .help = "Specify a custom list of percentiles to report", + .maxlen = FIO_IO_U_LIST_MAX_LEN, + .minfp = 0.0, + .maxfp = 100.0, + }, + #ifdef FIO_HAVE_DISK_UTIL { .name = "disk_util", @@ -2044,11 +2166,11 @@ void fio_keywords_init(void) sprintf(buf, "%lu", page_size); fio_keywords[0].replace = strdup(buf); - mb_memory = os_phys_mem() / page_size; + mb_memory = os_phys_mem() / (1024 * 1024); sprintf(buf, "%llu", mb_memory); fio_keywords[1].replace = strdup(buf); - l = sysconf(_SC_NPROCESSORS_ONLN); + l = cpus_online(); sprintf(buf, "%lu", l); fio_keywords[2].replace = strdup(buf); }