X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=1953e3d604216c53a1a12c86493d73e18cb75fb1;hp=ba57e4469d4ab4baf202b51c47702614b767941e;hb=43c129b4ff85a7f7f7e0929f9dd73e756e37a2e3;hpb=5973cafb37fbf24c3ca2cdf86a3d03f1b00d6d2b diff --git a/options.c b/options.c index ba57e446..1953e3d6 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) @@ -151,8 +154,10 @@ static int str_rw_cb(void *data, const char *str) char *nr = get_opt_postfix(str); td->o.ddir_nr = 1; - if (nr) + if (nr) { td->o.ddir_nr = atoi(nr); + free(nr); + } return 0; } @@ -178,6 +183,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) { @@ -226,9 +249,12 @@ static int str_cpumask_cb(void *data, unsigned int *val) CPU_ZERO(&td->o.cpumask); - for (i = 0; i < sizeof(int) * 8; i++) - if ((1 << i) & *val) + for (i = 0; i < sizeof(int) * 8; i++) { + if ((1 << i) & *val) { + dprint(FD_PARSE, "set cpu allowed %d\n", i); CPU_SET(*val, &td->o.cpumask); + } + } td->o.cpumask_set = 1; return 0; @@ -247,9 +273,29 @@ static int str_cpus_allowed_cb(void *data, const char *input) strip_blank_end(str); while ((cpu = strsep(&str, ",")) != NULL) { + char *str2, *cpu2; + int icpu, icpu2; + if (!strlen(cpu)) break; - CPU_SET(atoi(cpu), &td->o.cpumask); + + str2 = cpu; + icpu2 = -1; + while ((cpu2 = strsep(&str2, "-")) != NULL) { + if (!strlen(cpu2)) + break; + + icpu2 = atoi(cpu2); + } + + icpu = atoi(cpu); + if (icpu2 == -1) + icpu2 = icpu; + while (icpu <= icpu2) { + dprint(FD_PARSE, "set cpu allowed %d\n", icpu); + CPU_SET(atoi(cpu), &td->o.cpumask); + icpu++; + } } free(p); @@ -264,8 +310,10 @@ static int str_fst_cb(void *data, const char *str) char *nr = get_opt_postfix(str); td->file_service_nr = 1; - if (nr) + if (nr) { td->file_service_nr = atoi(nr); + free(nr); + } return 0; } @@ -273,17 +321,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); } - sprintf(file + elen, "/%s", 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; @@ -296,6 +351,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; } @@ -376,7 +433,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) @@ -396,8 +453,46 @@ static int str_lockfile_cb(void *data, const char *str) char *nr = get_opt_postfix(str); td->o.lockfile_batch = 1; - if (nr) + if (nr) { td->o.lockfile_batch = atoi(nr); + free(nr); + } + + return 0; +} + +static int str_write_bw_log_cb(void *data, const char *str) +{ + struct thread_data *td = data; + + if (str) + td->o.bw_log_file = strdup(str); + + td->o.write_bw_log = 1; + return 0; +} + +static int str_write_lat_log_cb(void *data, const char *str) +{ + struct thread_data *td = data; + + if (str) + td->o.lat_log_file = strdup(str); + + td->o.write_lat_log = 1; + return 0; +} + +static int str_gtod_reduce_cb(void *data, int *il) +{ + struct thread_data *td = data; + int val = *il; + + td->o.disable_clat = !!val; + td->o.disable_slat = !!val; + td->o.disable_bw = !!val; + if (val) + td->tv_cache_mask = 63; return 0; } @@ -433,6 +528,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", }, { @@ -526,6 +622,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", @@ -577,6 +678,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", @@ -584,6 +686,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, @@ -678,7 +789,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", }, @@ -785,6 +896,12 @@ static struct fio_option options[] = { .off1 = td_var_offset(time_based), .help = "Keep running until runtime/timeout is met", }, + { + .name = "ramp_time", + .type = FIO_OPT_STR_VAL_TIME, + .off1 = td_var_offset(ramp_time), + .help = "Ramp up time before measuring performance", + }, { .name = "mem", .alias = "iomem", @@ -843,6 +960,14 @@ static struct fio_option options[] = { .oval = VERIFY_CRC32, .help = "Use crc32 checksums for verification", }, + { .ival = "crc32c-intel", + .oval = VERIFY_CRC32C_INTEL, + .help = "Use hw crc32c 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", @@ -973,7 +1098,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", @@ -981,7 +1106,7 @@ 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", @@ -1186,14 +1311,16 @@ static struct fio_option options[] = { }, { .name = "write_bw_log", - .type = FIO_OPT_STR_SET, + .type = FIO_OPT_STR, .off1 = td_var_offset(write_bw_log), + .cb = str_write_bw_log_cb, .help = "Write log of bandwidth during run", }, { .name = "write_lat_log", - .type = FIO_OPT_STR_SET, + .type = FIO_OPT_STR, .off1 = td_var_offset(write_lat_log), + .cb = str_write_lat_log_cb, .help = "Write log of latency during run", }, { @@ -1226,10 +1353,41 @@ static struct fio_option options[] = { .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 + { + .name = "gtod_reduce", + .type = FIO_OPT_BOOL, + .help = "Greatly reduce number of gettimeofday() calls", + .cb = str_gtod_reduce_cb, + .def = "0", + }, + { + .name = "disable_clat", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(disable_clat), + .help = "Disable completion latency numbers", + .parent = "gtod_reduce", + .def = "0", + }, + { + .name = "disable_slat", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(disable_slat), + .help = "Disable submissionn latency numbers", + .parent = "gtod_reduce", + .def = "0", + }, + { + .name = "disable_bw_measurement", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(disable_bw), + .help = "Disable bandwidth logging", + .parent = "gtod_reduce", + .def = "0", + }, { .name = NULL, }, @@ -1248,7 +1406,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; @@ -1261,9 +1419,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)