X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=options.c;h=9606ab20e5a3fcb06e548347b3922502718b6f91;hp=8e11227c6e0ff2917fbb0307fcbabb601286ec53;hb=f2bba1820a567ac00b09916239ac8feb125cead2;hpb=6d459ee7e90393af490a64709aec206d8a585ebd diff --git a/options.c b/options.c index 8e11227c..9606ab20 100644 --- a/options.c +++ b/options.c @@ -11,6 +11,7 @@ #include #include "fio.h" +#include "verify.h" #include "parse.h" #include "lib/fls.h" @@ -40,21 +41,16 @@ static int bs_cmp(const void *p1, const void *p2) return bsp1->perc < bsp2->perc; } -static int str_bssplit_cb(void *data, const char *input) +static int bssplit_ddir(struct thread_data *td, int ddir, char *str) { - struct thread_data *td = data; - char *fname, *str, *p; + struct bssplit *bssplit; unsigned int i, perc, perc_missing; unsigned int max_bs, min_bs; long long val; + char *fname; - 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)); + td->o.bssplit_nr[ddir] = 4; + bssplit = malloc(4 * sizeof(struct bssplit)); i = 0; max_bs = 0; @@ -68,10 +64,9 @@ static int str_bssplit_cb(void *data, const char *input) /* * 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 + if (i == td->o.bssplit_nr[ddir]) { + td->o.bssplit_nr[ddir] <<= 1; + bssplit = realloc(bssplit, td->o.bssplit_nr[ddir] * sizeof(struct bssplit)); } @@ -98,19 +93,19 @@ static int str_bssplit_cb(void *data, const char *input) if (val < min_bs) min_bs = val; - td->o.bssplit[i].bs = val; - td->o.bssplit[i].perc = perc; + bssplit[i].bs = val; + bssplit[i].perc = perc; i++; } - td->o.bssplit_nr = i; + td->o.bssplit_nr[ddir] = 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]; + for (i = 0; i < td->o.bssplit_nr[ddir]; i++) { + struct bssplit *bsp = &bssplit[i]; if (bsp->perc == (unsigned char) -1) perc_missing++; @@ -120,7 +115,7 @@ static int str_bssplit_cb(void *data, const char *input) if (perc > 100) { log_err("fio: bssplit percentages add to more than 100%%\n"); - free(td->o.bssplit); + free(bssplit); return 1; } /* @@ -128,24 +123,58 @@ static int str_bssplit_cb(void *data, const char *input) * them. */ if (perc_missing) { - for (i = 0; i < td->o.bssplit_nr; i++) { - struct bssplit *bsp = &td->o.bssplit[i]; + for (i = 0; i < td->o.bssplit_nr[ddir]; i++) { + struct bssplit *bsp = &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; + td->o.min_bs[ddir] = min_bs; + td->o.max_bs[ddir] = max_bs; /* * now sort based on percentages, for ease of lookup */ - qsort(td->o.bssplit, td->o.bssplit_nr, sizeof(struct bssplit), bs_cmp); + qsort(bssplit, td->o.bssplit_nr[ddir], sizeof(struct bssplit), bs_cmp); + td->o.bssplit[ddir] = bssplit; + return 0; + +} + +static int str_bssplit_cb(void *data, const char *input) +{ + struct thread_data *td = data; + char *str, *p, *odir; + int ret = 0; + + p = str = strdup(input); + + strip_blank_front(&str); + strip_blank_end(str); + + odir = strchr(str, ','); + if (odir) { + ret = bssplit_ddir(td, DDIR_WRITE, odir + 1); + if (!ret) { + *odir = '\0'; + ret = bssplit_ddir(td, DDIR_READ, str); + } + } else { + char *op; + + op = strdup(str); + + ret = bssplit_ddir(td, DDIR_READ, str); + if (!ret) + ret = bssplit_ddir(td, DDIR_WRITE, op); + + free(op); + } free(p); - return 0; + return ret; } static int str_rw_cb(void *data, const char *str) @@ -247,8 +276,15 @@ static int str_cpumask_cb(void *data, unsigned int *val) struct thread_data *td = data; unsigned int i; long max_cpu; + int ret; + + ret = fio_cpuset_init(&td->o.cpumask); + if (ret < 0) { + log_err("fio: cpuset_init failed\n"); + td_verror(td, ret, "fio_cpuset_init"); + return 1; + } - fio_cpuset_init(td); max_cpu = sysconf(_SC_NPROCESSORS_ONLN); for (i = 0; i < sizeof(int) * 8; i++) { @@ -274,7 +310,12 @@ static int str_cpus_allowed_cb(void *data, const char *input) long max_cpu; int ret = 0; - fio_cpuset_init(td); + ret = fio_cpuset_init(&td->o.cpumask); + if (ret < 0) { + log_err("fio: cpuset_init failed\n"); + td_verror(td, ret, "fio_cpuset_init"); + return 1; + } p = str = strdup(input); @@ -565,7 +606,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" */ + .prio = -1, /* must come after "directory" */ .help = "File(s) to use for the workload", }, { @@ -718,7 +759,7 @@ static struct fio_option options[] = { .alias = "iodepth_batch_submit", .type = FIO_OPT_INT, .off1 = td_var_offset(iodepth_batch), - .help = "Number of IO to submit in one go", + .help = "Number of IO buffers to submit in one go", .parent = "iodepth", .minval = 1, .def = "1", @@ -727,7 +768,7 @@ static struct fio_option options[] = { .name = "iodepth_batch_complete", .type = FIO_OPT_INT, .off1 = td_var_offset(iodepth_batch_complete), - .help = "Number of IO to retrieve in one go", + .help = "Number of IO buffers to retrieve in one go", .parent = "iodepth", .minval = 0, .def = "1", @@ -772,7 +813,7 @@ static struct fio_option options[] = { { .name = "bs", .alias = "blocksize", - .type = FIO_OPT_STR_VAL_INT, + .type = FIO_OPT_INT, .off1 = td_var_offset(bs[DDIR_READ]), .off2 = td_var_offset(bs[DDIR_WRITE]), .minval = 1, @@ -780,6 +821,16 @@ static struct fio_option options[] = { .def = "4k", .parent = "rw", }, + { + .name = "ba", + .alias = "blockalign", + .type = FIO_OPT_INT, + .off1 = td_var_offset(ba[DDIR_READ]), + .off2 = td_var_offset(ba[DDIR_WRITE]), + .minval = 1, + .help = "IO block offset alignment", + .parent = "rw", + }, { .name = "bsrange", .alias = "blocksize_range", @@ -859,6 +910,10 @@ static struct fio_option options[] = { .oval = FIO_FSERVICE_RR, .help = "Round robin select files", }, + { .ival = "sequential", + .oval = FIO_FSERVICE_SEQ, + .help = "Finish one file before moving to the next", + }, }, .parent = "nrfiles", }, @@ -1050,7 +1105,7 @@ static struct fio_option options[] = { }, { .name = "verify_interval", - .type = FIO_OPT_STR_VAL_INT, + .type = FIO_OPT_INT, .off1 = td_var_offset(verify_interval), .minval = 2 * sizeof(struct verify_header), .help = "Store verify buffer header every N bytes", @@ -1058,7 +1113,7 @@ static struct fio_option options[] = { }, { .name = "verify_offset", - .type = FIO_OPT_STR_VAL_INT, + .type = FIO_OPT_INT, .help = "Offset verify header location by N bytes", .def = "0", .cb = str_verify_offset_cb, @@ -1205,26 +1260,30 @@ static struct fio_option options[] = { { .name = "rate", .type = FIO_OPT_INT, - .off1 = td_var_offset(rate), + .off1 = td_var_offset(rate[0]), + .off2 = td_var_offset(rate[1]), .help = "Set bandwidth rate", }, { .name = "ratemin", .type = FIO_OPT_INT, - .off1 = td_var_offset(ratemin), + .off1 = td_var_offset(ratemin[0]), + .off2 = td_var_offset(ratemin[1]), .help = "Job must meet this rate or it will be shutdown", .parent = "rate", }, { .name = "rate_iops", .type = FIO_OPT_INT, - .off1 = td_var_offset(rate_iops), + .off1 = td_var_offset(rate_iops[0]), + .off2 = td_var_offset(rate_iops[1]), .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), + .off1 = td_var_offset(rate_iops_min[0]), + .off2 = td_var_offset(rate_iops_min[1]), .help = "Job must meet this rate or it will be shutdown", .parent = "rate_iops", }, @@ -1273,6 +1332,20 @@ static struct fio_option options[] = { .help = "Fsync file after creation", .def = "1", }, + { + .name = "create_on_open", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(create_on_open), + .help = "Create files when they are opened for IO", + .def = "0", + }, + { + .name = "pre_read", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(pre_read), + .help = "Preread files before starting official testing", + .def = "0", + }, { .name = "cpuload", .type = FIO_OPT_INT, @@ -1362,7 +1435,7 @@ static struct fio_option options[] = { }, { .name = "hugepage-size", - .type = FIO_OPT_STR_VAL_INT, + .type = FIO_OPT_INT, .off1 = td_var_offset(hugepage_size), .help = "When using hugepages, specify size of each page", .def = __stringify(FIO_HUGE_PAGE), @@ -1431,6 +1504,13 @@ static struct fio_option options[] = { .cb = str_gtod_cpu_cb, .help = "Setup dedicated gettimeofday() thread on this CPU", }, + { + .name = "continue_on_error", + .type = FIO_OPT_BOOL, + .off1 = td_var_offset(continue_on_error), + .help = "Continue on non-fatal errors during I/O", + .def = "0", + }, { .name = NULL, },