X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=3c37e9105698cbabb0f46d66816de93762d8cd3e;hp=f502247d1eb6323b27a3960ec9e20b01ffa2c9ae;hb=3c48c2c1c702047f8a92fa21fdd1471781b9dab4;hpb=4e991c23d2d06484f581eb5e2105bc102cb35941 diff --git a/options.c b/options.c index f502247d..3c37e910 100644 --- a/options.c +++ b/options.c @@ -5,11 +5,16 @@ #include #include #include +#include +#include +#include +#include #include "fio.h" #include "parse.h" +#include "fls.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 +32,141 @@ static char *get_opt_postfix(const char *str) return strdup(p); } +static int bs_cmp(const void *p1, const void *p2) +{ + const struct bssplit *bsp1 = p1; + const struct bssplit *bsp2 = p2; + + return bsp1->perc < bsp2->perc; +} + +static int str_bssplit_cb(void *data, const char *input) +{ + struct thread_data *td = data; + char *fname, *str, *p; + unsigned int i, perc, perc_missing; + unsigned int max_bs, min_bs; + long long val; + + p = str = strdup(input); + + strip_blank_front(&str); + strip_blank_end(str); + + td->o.bssplit_nr = 4; + td->o.bssplit = malloc(4 * sizeof(struct bssplit)); + + i = 0; + max_bs = 0; + min_bs = -1; + while ((fname = strsep(&str, ":")) != NULL) { + char *perc_str; + + if (!strlen(fname)) + break; + + /* + * grow struct buffer, if needed + */ + if (i == td->o.bssplit_nr) { + td->o.bssplit_nr <<= 1; + td->o.bssplit = realloc(td->o.bssplit, + td->o.bssplit_nr + * sizeof(struct bssplit)); + } + + perc_str = strstr(fname, "/"); + if (perc_str) { + *perc_str = '\0'; + perc_str++; + perc = atoi(perc_str); + if (perc > 100) + perc = 100; + else if (!perc) + perc = -1; + } else + perc = -1; + + if (str_to_decimal(fname, &val, 1)) { + log_err("fio: bssplit conversion failed\n"); + free(td->o.bssplit); + return 1; + } + + if (val > max_bs) + max_bs = val; + if (val < min_bs) + min_bs = val; + + td->o.bssplit[i].bs = val; + td->o.bssplit[i].perc = perc; + i++; + } + + td->o.bssplit_nr = i; + + /* + * Now check if the percentages add up, and how much is missing + */ + perc = perc_missing = 0; + for (i = 0; i < td->o.bssplit_nr; i++) { + struct bssplit *bsp = &td->o.bssplit[i]; + + if (bsp->perc == (unsigned char) -1) + perc_missing++; + else + perc += bsp->perc; + } + + if (perc > 100) { + log_err("fio: bssplit percentages add to more than 100%%\n"); + free(td->o.bssplit); + return 1; + } + /* + * If values didn't have a percentage set, divide the remains between + * them. + */ + if (perc_missing) { + for (i = 0; i < td->o.bssplit_nr; i++) { + struct bssplit *bsp = &td->o.bssplit[i]; + + if (bsp->perc == (unsigned char) -1) + bsp->perc = (100 - perc) / perc_missing; + } + } + + td->o.min_bs[DDIR_READ] = td->o.min_bs[DDIR_WRITE] = min_bs; + td->o.max_bs[DDIR_READ] = td->o.max_bs[DDIR_WRITE] = max_bs; + + /* + * now sort based on percentages, for ease of lookup + */ + qsort(td->o.bssplit, td->o.bssplit_nr, sizeof(struct bssplit), bs_cmp); + + free(p); + return 0; +} + +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; } @@ -48,12 +181,38 @@ 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) { 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; + td->ioprio_set = 1; return 0; } @@ -62,6 +221,14 @@ static int str_prio_cb(void *data, unsigned int *val) 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; + + td->ioprio_set = 1; return 0; } #endif @@ -72,27 +239,45 @@ static int str_exitall_cb(void) return 0; } -static void fill_cpu_mask(os_cpu_mask_t cpumask, int cpu) -{ #ifdef FIO_HAVE_CPU_AFFINITY +static int str_cpumask_cb(void *data, unsigned int *val) +{ + struct thread_data *td = data; unsigned int i; - CPU_ZERO(&cpumask); + CPU_ZERO(&td->o.cpumask); - for (i = 0; i < sizeof(int) * 8; i++) { - if ((1 << i) & cpu) - CPU_SET(i, &cpumask); - } -#endif + for (i = 0; i < sizeof(int) * 8; i++) + if ((1 << i) & *val) + CPU_SET(*val, &td->o.cpumask); + + td->o.cpumask_set = 1; + return 0; } -static int str_cpumask_cb(void *data, unsigned int *val) +static int str_cpus_allowed_cb(void *data, const char *input) { struct thread_data *td = data; + char *cpu, *str, *p; + + CPU_ZERO(&td->o.cpumask); + + p = str = strdup(input); - fill_cpu_mask(td->cpumask, *val); + strip_blank_front(&str); + strip_blank_end(str); + + while ((cpu = strsep(&str, ",")) != NULL) { + if (!strlen(cpu)) + break; + CPU_SET(atoi(cpu), &td->o.cpumask); + } + + free(p); + td->o.cpumask_set = 1; return 0; } +#endif static int str_fst_cb(void *data, const char *str) { @@ -106,6 +291,45 @@ static int str_fst_cb(void *data, const char *str) return 0; } +static int check_dir(struct thread_data *td, char *fname) +{ + char file[PATH_MAX], *dir; + int elen = 0; + + if (td->o.directory) { + strcpy(file, td->o.directory); + strcat(file, "/"); + elen = strlen(file); + } + + 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; + + log_err("fio: %s is not a directory\n", dir); + td_verror(td, ret, "lstat"); + return 1; + } + + if (!S_ISDIR(sb.st_mode)) { + log_err("fio: %s is not a directory\n", dir); + return 1; + } + } +#endif + + return 0; +} + static int str_filename_cb(void *data, const char *input) { struct thread_data *td = data; @@ -117,13 +341,17 @@ 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; + if (check_dir(td, fname)) { + free(p); + return 1; + } add_file(td, fname); - td->nr_files++; + td->o.nr_files++; } free(p); @@ -135,13 +363,15 @@ 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); - td_verror(td, errno, "lstat"); + if (lstat(td->o.directory, &sb) < 0) { + int ret = errno; + + log_err("fio: %s is not a directory\n", td->o.directory); + td_verror(td, ret, "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,11 +383,54 @@ 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); } +static int str_verify_offset_cb(void *data, unsigned int *off) +{ + struct thread_data *td = data; + + if (*off && *off < sizeof(struct verify_header)) { + log_err("fio: verify_offset too small\n"); + return 1; + } + + td->o.verify_offset = *off; + return 0; +} + +static int str_verify_pattern_cb(void *data, unsigned int *off) +{ + struct thread_data *td = data; + unsigned int msb; + + msb = __fls(*off); + if (msb <= 8) + td->o.verify_pattern_bytes = 1; + else if (msb <= 16) + td->o.verify_pattern_bytes = 2; + else if (msb <= 24) + td->o.verify_pattern_bytes = 3; + else + td->o.verify_pattern_bytes = 4; + + td->o.verify_pattern = *off; + return 0; +} + +static int str_lockfile_cb(void *data, const char *str) +{ + struct thread_data *td = data; + char *nr = get_opt_postfix(str); + + td->o.lockfile_batch = 1; + if (nr) + td->o.lockfile_batch = atoi(nr); + + return 0; +} #define __stringify_1(x) #x #define __stringify(x) __stringify_1(x) @@ -192,6 +465,30 @@ static struct fio_option options[] = { .cb = str_filename_cb, .help = "File(s) to use for the workload", }, + { + .name = "lockfile", + .type = FIO_OPT_STR, + .cb = str_lockfile_cb, + .off1 = td_var_offset(file_lock_mode), + .help = "Lock file when doing IO to it", + .parent = "filename", + .def = "none", + .posval = { + { .ival = "none", + .oval = FILE_LOCK_NONE, + .help = "No file locking", + }, + { .ival = "exclusive", + .oval = FILE_LOCK_EXCLUSIVE, + .help = "Exclusive file lock", + }, + { + .ival = "readwrite", + .oval = FILE_LOCK_READWRITE, + .help = "Read vs write lock", + }, + }, + }, { .name = "opendir", .type = FIO_OPT_STR_STORE, @@ -201,7 +498,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", @@ -242,6 +541,12 @@ static struct fio_option options[] = { { .ival = "sync", .help = "Use read/write", }, + { .ival = "psync", + .help = "Use pread/pwrite", + }, + { .ival = "vsync", + .help = "Use readv/writev", + }, #ifdef FIO_HAVE_LIBAIO { .ival = "libaio", .help = "Linux native asynchronous IO", @@ -251,6 +556,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", @@ -259,6 +569,9 @@ static struct fio_option options[] = { { .ival = "splice", .help = "splice/vmsplice based IO", }, + { .ival = "netsplice", + .help = "splice/vmsplice to/from the network", + }, #endif #ifdef FIO_HAVE_SGIO { .ival = "sg", @@ -279,6 +592,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)", }, @@ -289,6 +607,7 @@ static struct fio_option options[] = { .type = FIO_OPT_INT, .off1 = td_var_offset(iodepth), .help = "Amount of IO buffers to keep in flight", + .minval = 1, .def = "1", }, { @@ -296,55 +615,84 @@ static struct fio_option options[] = { .type = FIO_OPT_INT, .off1 = td_var_offset(iodepth_batch), .help = "Number of IO to submit in one go", + .parent = "iodepth", + .minval = 1, + .def = "1", }, { .name = "iodepth_low", .type = FIO_OPT_INT, .off1 = td_var_offset(iodepth_low), .help = "Low water mark for queuing depth", + .parent = "iodepth", }, { .name = "size", .type = FIO_OPT_STR_VAL, - .off1 = td_var_offset(total_file_size), + .off1 = td_var_offset(size), + .minval = 1, .help = "Total size of device or files", }, + { + .name = "fill_device", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(fill_device), + .help = "Write until an ENOSPC error occurs", + .def = "0", + }, { .name = "filesize", .type = FIO_OPT_STR_VAL, .off1 = td_var_offset(file_size_low), .off2 = td_var_offset(file_size_high), + .minval = 1, .help = "Size of individual files", }, + { + .name = "offset", + .alias = "fileoffset", + .type = FIO_OPT_STR_VAL, + .off1 = td_var_offset(start_offset), + .help = "Start IO from this offset", + .def = "0", + }, { .name = "bs", + .alias = "blocksize", .type = FIO_OPT_STR_VAL_INT, .off1 = td_var_offset(bs[DDIR_READ]), .off2 = td_var_offset(bs[DDIR_WRITE]), + .minval = 1, .help = "Block size unit", .def = "4k", + .parent = "rw", }, { .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]), .off3 = td_var_offset(min_bs[DDIR_WRITE]), .off4 = td_var_offset(max_bs[DDIR_WRITE]), + .minval = 1, .help = "Set block size range (in more detail than bs)", + .parent = "rw", + }, + { + .name = "bssplit", + .type = FIO_OPT_STR, + .cb = str_bssplit_cb, + .help = "Set a specific mix of block sizes", + .parent = "rw", }, { .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", - }, - { - .name = "offset", - .type = FIO_OPT_STR_VAL, - .off1 = td_var_offset(start_offset), - .help = "Start IO from this offset", - .def = "0", + .parent = "rw", }, { .name = "randrepeat", @@ -352,12 +700,22 @@ static struct fio_option options[] = { .off1 = td_var_offset(rand_repeatable), .help = "Use repeatable random IO pattern", .def = "1", + .parent = "rw", }, { .name = "norandommap", .type = FIO_OPT_STR_SET, .off1 = td_var_offset(norandommap), .help = "Accept potential duplicate random blocks", + .parent = "rw", + }, + { + .name = "softrandommap", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(softrandommap), + .help = "Allow randommap to fail and continue witout", + .parent = "norandommap", + .def = "0", }, { .name = "nrfiles", @@ -389,6 +747,14 @@ static struct fio_option options[] = { .help = "Round robin select files", }, }, + .parent = "nrfiles", + }, + { + .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 = "fsync", @@ -448,8 +814,15 @@ static struct fio_option options[] = { .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", .type = FIO_OPT_STR, .cb = str_mem_cb, .off1 = td_var_offset(mem_type), @@ -493,16 +866,92 @@ static struct fio_option options[] = { .oval = VERIFY_NONE, .help = "Don't do IO verification", }, + { .ival = "md5", + .oval = VERIFY_MD5, + .help = "Use md5 checksums for verification", + }, + { .ival = "crc64", + .oval = VERIFY_CRC64, + .help = "Use crc64 checksums for verification", + }, { .ival = "crc32", .oval = VERIFY_CRC32, .help = "Use crc32 checksums for verification", }, - { .ival = "md5", - .oval = VERIFY_MD5, - .help = "Use md5 checksums for verification", + { .ival = "crc16", + .oval = VERIFY_CRC16, + .help = "Use crc16 checksums for verification", + }, + { .ival = "crc7", + .oval = VERIFY_CRC7, + .help = "Use crc7 checksums for verification", + }, + { .ival = "sha256", + .oval = VERIFY_SHA256, + .help = "Use sha256 checksums for verification", + }, + { .ival = "sha512", + .oval = VERIFY_SHA512, + .help = "Use sha512 checksums for verification", + }, + { .ival = "meta", + .oval = VERIFY_META, + .help = "Use io information", + }, + { + .ival = "null", + .oval = VERIFY_NULL, + .help = "Pretend to verify", }, }, }, + { + .name = "do_verify", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(do_verify), + .help = "Run verification stage after write", + .def = "1", + .parent = "verify", + }, + { + .name = "verifysort", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(verifysort), + .help = "Sort written verify blocks for read back", + .def = "1", + .parent = "verify", + }, + { + .name = "verify_interval", + .type = FIO_OPT_STR_VAL_INT, + .off1 = td_var_offset(verify_interval), + .minval = 2 * sizeof(struct verify_header), + .help = "Store verify buffer header every N bytes", + .parent = "verify", + }, + { + .name = "verify_offset", + .type = FIO_OPT_STR_VAL_INT, + .help = "Offset verify header location by N bytes", + .def = "0", + .cb = str_verify_offset_cb, + .parent = "verify", + }, + { + .name = "verify_pattern", + .type = FIO_OPT_INT, + .cb = str_verify_pattern_cb, + .help = "Fill pattern for IO buffers", + .parent = "verify", + }, + { + .name = "verify_fatal", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(verify_fatal), + .def = "0", + .help = "Exit on a single verify failure, don't continue", + .parent = "verify", + }, { .name = "write_iolog", .type = FIO_OPT_STR_STORE, @@ -556,17 +1005,10 @@ static struct fio_option options[] = { .help = "Lock down this amount of memory", .def = "0", }, - { - .name = "rwmixcycle", - .type = FIO_OPT_INT, - .off1 = td_var_offset(rwmixcycle), - .help = "Cycle period for mixed read/write workloads (msec)", - .def = "500", - }, { .name = "rwmixread", .type = FIO_OPT_INT, - .off1 = td_var_offset(rwmixread), + .cb = str_rwmix_read_cb, .maxval = 100, .help = "Percentage of mixed workload that is reads", .def = "50", @@ -574,11 +1016,15 @@ static struct fio_option options[] = { { .name = "rwmixwrite", .type = FIO_OPT_INT, - .off1 = td_var_offset(rwmixwrite), + .cb = str_rwmix_write_cb, .maxval = 100, .help = "Percentage of mixed workload that is writes", .def = "50", }, + { + .name = "rwmixcycle", + .type = FIO_OPT_DEPRECATED, + }, { .name = "nice", .type = FIO_OPT_INT, @@ -619,6 +1065,7 @@ static struct fio_option options[] = { .off1 = td_var_offset(thinktime_spin), .help = "Start think time by spinning this amount (usec)", .def = "0", + .parent = "thinktime", }, { .name = "thinktime_blocks", @@ -626,6 +1073,7 @@ static struct fio_option options[] = { .off1 = td_var_offset(thinktime_blocks), .help = "IO buffer period between 'thinktime'", .def = "1", + .parent = "thinktime", }, { .name = "rate", @@ -638,6 +1086,7 @@ static struct fio_option options[] = { .type = FIO_OPT_INT, .off1 = td_var_offset(ratemin), .help = "Job must meet this rate or it will be shutdown", + .parent = "rate", }, { .name = "rate_iops", @@ -650,6 +1099,7 @@ static struct fio_option options[] = { .type = FIO_OPT_INT, .off1 = td_var_offset(rate_iops_min), .help = "Job must meet this rate or it will be shutdown", + .parent = "rate_iops", }, { .name = "ratecycle", @@ -657,6 +1107,7 @@ static struct fio_option options[] = { .off1 = td_var_offset(ratecycle), .help = "Window average for rate limits (msec)", .def = "1000", + .parent = "rate", }, { .name = "invalidate", @@ -671,12 +1122,14 @@ static struct fio_option options[] = { .off1 = td_var_offset(sync_io), .help = "Use O_SYNC for buffered writes", .def = "0", + .parent = "buffered", }, { .name = "bwavgtime", .type = FIO_OPT_INT, .off1 = td_var_offset(bw_avg_time), - .help = "Time window over which to calculate bandwidth (msec)", + .help = "Time window over which to calculate bandwidth" + " (msec)", .def = "500", }, { @@ -705,6 +1158,7 @@ static struct fio_option options[] = { .off1 = td_var_offset(cpucycle), .help = "Length of the CPU burn cycles (usecs)", .def = "50000", + .parent = "cpuload", }, #ifdef FIO_HAVE_CPU_AFFINITY { @@ -713,6 +1167,12 @@ static struct fio_option options[] = { .cb = str_cpumask_cb, .help = "CPU affinity mask", }, + { + .name = "cpus_allowed", + .type = FIO_OPT_STR, + .cb = str_cpus_allowed_cb, + .help = "Set CPUs allowed", + }, #endif { .name = "end_fsync", @@ -747,6 +1207,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, @@ -767,7 +1233,7 @@ static struct fio_option options[] = { }, { .name = "hugepage-size", - .type = FIO_OPT_STR_VAL, + .type = FIO_OPT_STR_VAL_INT, .off1 = td_var_offset(hugepage_size), .help = "When using hugepages, specify size of each page", .def = __stringify(FIO_HUGE_PAGE), @@ -778,6 +1244,27 @@ static struct fio_option options[] = { .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", + }, + { + .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", + .def = "1", + }, +#endif { .name = NULL, }, @@ -796,7 +1283,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; @@ -828,3 +1315,41 @@ int fio_show_option_help(const char *opt) { 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 +}