X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=5b4e3938d5765711a36c2845e1b6f7eb8bc14c70;hp=ead31ace29c00fb88247ea82ec76502edafb582a;hb=bac39e0e8807a1d52863ad8304e67221df2bc63b;hpb=47d85e2bd4763204a983c7bf4833c0d466dc36ca diff --git a/options.c b/options.c index ead31ace..5b4e3938 100644 --- a/options.c +++ b/options.c @@ -6,10 +6,13 @@ #include #include #include +#include +#include +#include #include "fio.h" #include "parse.h" -#include "fls.h" +#include "lib/fls.h" #define td_var_offset(var) ((size_t) &((struct thread_options *)0)->var) @@ -178,6 +181,24 @@ static int str_lockmem_cb(void fio_unused *data, unsigned long *val) return 0; } +static int str_rwmix_read_cb(void *data, unsigned int *val) +{ + struct thread_data *td = data; + + td->o.rwmix[DDIR_READ] = *val; + td->o.rwmix[DDIR_WRITE] = 100 - *val; + return 0; +} + +static int str_rwmix_write_cb(void *data, unsigned int *val) +{ + struct thread_data *td = data; + + td->o.rwmix[DDIR_WRITE] = *val; + td->o.rwmix[DDIR_READ] = 100 - *val; + return 0; +} + #ifdef FIO_HAVE_IOPRIO static int str_prioclass_cb(void *data, unsigned int *val) { @@ -273,11 +294,24 @@ static int str_fst_cb(void *data, const char *str) static int check_dir(struct thread_data *td, char *fname) { char file[PATH_MAX], *dir; - struct stat sb; + int elen = 0; + + if (td->o.directory) { + strcpy(file, td->o.directory); + strcat(file, "/"); + elen = strlen(file); + } - strcpy(file, fname); + sprintf(file + elen, "%s", fname); dir = dirname(file); +#if 0 + { + struct stat sb; + /* + * We can't do this on FIO_DISKLESSIO engines. The engine isn't loaded + * yet, so we can't do this check right here... + */ if (lstat(dir, &sb) < 0) { int ret = errno; @@ -290,6 +324,8 @@ static int check_dir(struct thread_data *td, char *fname) log_err("fio: %s is not a directory\n", dir); return 1; } + } +#endif return 0; } @@ -370,7 +406,7 @@ static int str_verify_pattern_cb(void *data, unsigned int *off) struct thread_data *td = data; unsigned int msb; - msb = fls(*off); + msb = __fls(*off); if (msb <= 8) td->o.verify_pattern_bytes = 1; else if (msb <= 16) @@ -427,6 +463,7 @@ static struct fio_option options[] = { .type = FIO_OPT_STR_STORE, .off1 = td_var_offset(filename), .cb = str_filename_cb, + .prio = 1, /* must come before "directory" */ .help = "File(s) to use for the workload", }, { @@ -520,6 +557,11 @@ static struct fio_option options[] = { { .ival = "posixaio", .help = "POSIX asynchronous IO", }, +#endif +#ifdef FIO_HAVE_SOLARISAIO + { .ival = "solarisaio", + .help = "Solaris native asynchronous IO", + }, #endif { .ival = "mmap", .help = "Memory mapped IO", @@ -571,6 +613,7 @@ static struct fio_option options[] = { }, { .name = "iodepth_batch", + .alias = "iodepth_batch_submit", .type = FIO_OPT_INT, .off1 = td_var_offset(iodepth_batch), .help = "Number of IO to submit in one go", @@ -578,6 +621,15 @@ static struct fio_option options[] = { .minval = 1, .def = "1", }, + { + .name = "iodepth_batch_complete", + .type = FIO_OPT_INT, + .off1 = td_var_offset(iodepth_batch_complete), + .help = "Number of IO to retrieve in one go", + .parent = "iodepth", + .minval = 0, + .def = "1", + }, { .name = "iodepth_low", .type = FIO_OPT_INT, @@ -672,7 +724,7 @@ static struct fio_option options[] = { .name = "softrandommap", .type = FIO_OPT_BOOL, .off1 = td_var_offset(softrandommap), - .help = "Allow randommap to fail and continue witout", + .help = "Set norandommap if randommap allocation fails", .parent = "norandommap", .def = "0", }, @@ -837,6 +889,10 @@ static struct fio_option options[] = { .oval = VERIFY_CRC32, .help = "Use crc32 checksums for verification", }, + { .ival = "crc32c", + .oval = VERIFY_CRC32C, + .help = "Use crc32c checksums for verification", + }, { .ival = "crc16", .oval = VERIFY_CRC16, .help = "Use crc16 checksums for verification", @@ -967,7 +1023,7 @@ static struct fio_option options[] = { { .name = "rwmixread", .type = FIO_OPT_INT, - .off1 = td_var_offset(rwmix[DDIR_READ]), + .cb = str_rwmix_read_cb, .maxval = 100, .help = "Percentage of mixed workload that is reads", .def = "50", @@ -975,18 +1031,14 @@ static struct fio_option options[] = { { .name = "rwmixwrite", .type = FIO_OPT_INT, - .off1 = td_var_offset(rwmix[DDIR_WRITE]), + .cb = str_rwmix_write_cb, .maxval = 100, .help = "Percentage of mixed workload that is writes", .def = "50", }, { .name = "rwmixcycle", - .type = FIO_OPT_INT, - .off1 = td_var_offset(rwmixcycle), - .help = "Cycle period for mixed read/write workloads (msec)", - .def = "500", - .parent = "rwmixread", + .type = FIO_OPT_DEPRECATED, }, { .name = "nice", @@ -1213,12 +1265,18 @@ static struct fio_option options[] = { .off1 = td_var_offset(zero_buffers), .help = "Init IO buffers to all zeroes", }, + { + .name = "refill_buffers", + .type = FIO_OPT_STR_SET, + .off1 = td_var_offset(refill_buffers), + .help = "Refill IO buffers on every IO submit", + }, #ifdef FIO_HAVE_DISK_UTIL { .name = "disk_util", .type = FIO_OPT_BOOL, .off1 = td_var_offset(do_disk_util), - .help = "Log disk utilization stats", + .help = "Log disk utilization statistics", .def = "1", }, #endif @@ -1240,7 +1298,7 @@ void fio_options_dup_and_init(struct option *long_options) o = &options[0]; while (o->name) { - long_options[i].name = o->name; + long_options[i].name = (char *) o->name; long_options[i].val = FIO_GETOPT_JOB; if (o->type == FIO_OPT_STR_SET) long_options[i].has_arg = no_argument; @@ -1253,9 +1311,16 @@ void fio_options_dup_and_init(struct option *long_options) } } -int fio_option_parse(struct thread_data *td, const char *opt) +int fio_options_parse(struct thread_data *td, char **opts, int num_opts) { - return parse_option(opt, options, td); + int i, ret; + + sort_options(opts, options, num_opts); + + for (ret = 0, i = 0; i < num_opts; i++) + ret |= parse_option(opts[i], options, td); + + return ret; } int fio_cmd_option_parse(struct thread_data *td, const char *opt, char *val)