X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=c75bed21d670b29fae359c917af5aaed12331334;hp=5588c852b9c828cc49b31c4ae4a43758efadd3dc;hb=07739b57f09886b41323c605b0dbda7d2c12522b;hpb=78217dfa392a6a39f018722e91bc179e9d5443df;ds=sidebyside diff --git a/init.c b/init.c index 5588c852..c75bed21 100644 --- a/init.c +++ b/init.c @@ -85,11 +85,25 @@ static struct fio_option options[] = { .help = "IO engine to use", .def = "sync", .posval = { - { .ival = "sync", }, { .ival = "libaio", }, - { .ival = "posixaio", }, { .ival = "mmap", }, - { .ival = "splice", }, { .ival = "sg", }, + { .ival = "sync", }, +#ifdef FIO_HAVE_LIBAIO + { .ival = "libaio", }, +#endif +#ifdef FIO_HAVE_POSIXAIO + { .ival = "posixaio", }, +#endif + { .ival = "mmap", }, +#ifdef FIO_HAVE_SPLICE + { .ival = "splice", }, +#endif +#ifdef FIO_HAVE_SGIO + { .ival = "sg", }, +#endif { .ival = "null", }, { .ival = "net", }, +#ifdef FIO_HAVE_SYSLET { .ival = "syslet-rw", }, +#endif + { .ival = "external", }, }, }, { @@ -99,6 +113,12 @@ static struct fio_option options[] = { .help = "Amount of IO buffers to keep in flight", .def = "1", }, + { + .name = "iodepth_batch", + .type = FIO_OPT_INT, + .off1 = td_var_offset(iodepth_batch), + .help = "Number of IO to submit in one go", + }, { .name = "iodepth_low", .type = FIO_OPT_INT, @@ -161,6 +181,12 @@ static struct fio_option options[] = { .help = "Split job workload between this number of files", .def = "1", }, + { + .name = "openfiles", + .type = FIO_OPT_INT, + .off1 = td_var_offset(open_files), + .help = "Number of files to keep open at the same time", + }, { .name = "file_service_type", .type = FIO_OPT_STR, @@ -375,7 +401,7 @@ static struct fio_option options[] = { .name = "thinktime_spin", .type = FIO_OPT_INT, .off1 = td_var_offset(thinktime_spin), - .help = "Start thinktime by spinning this amount (usec)", + .help = "Start think time by spinning this amount (usec)", .def = "0", }, { @@ -510,6 +536,12 @@ static struct fio_option options[] = { .help = "When using hugepages, specify size of each page", .def = __stringify(FIO_HUGE_PAGE), }, + { + .name = "group_reporting", + .type = FIO_OPT_STR_SET, + .off1 = td_var_offset(group_reporting), + .help = "Do reporting on a per-group basis", + }, { .name = NULL, }, @@ -561,7 +593,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = { }, { .name = "cmdhelp", - .has_arg = required_argument, + .has_arg = optional_argument, .val = 'c', }, { @@ -571,7 +603,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = { static int def_timeout = 0; -static char fio_version_string[] = "fio 1.11"; +static char fio_version_string[] = "fio 1.13"; static char **ini_file; static int max_jobs = MAX_JOBS; @@ -588,6 +620,16 @@ FILE *f_err = NULL; static int write_lat_log = 0; int write_bw_log = 0; +FILE *get_f_out() +{ + return f_out; +} + +FILE *get_f_err() +{ + return f_err; +} + /* * Return a free job structure. */ @@ -638,13 +680,13 @@ static void fixup_options(struct thread_data *td) td->iodepth = 1; else { if (!td->iodepth) - td->iodepth = td->nr_files; + td->iodepth = td->open_files; } /* * only really works for sequential io for now, and with 1 file */ - if (td->zone_size && td_random(td) && td->nr_files == 1) + if (td->zone_size && td_random(td) && td->open_files == 1) td->zone_size = 0; /* @@ -689,8 +731,26 @@ static void fixup_options(struct thread_data *td) /* * The low water mark cannot be bigger than the iodepth */ - if (td->iodepth_low > td->iodepth || !td->iodepth_low) - td->iodepth_low = td->iodepth; + if (td->iodepth_low > td->iodepth || !td->iodepth_low) { + /* + * syslet work around - if the workload is sequential, + * we want to let the queue drain all the way down to + * avoid seeking between async threads + */ + if (!strcmp(td->io_ops->name, "syslet-rw") && !td_random(td)) + td->iodepth_low = 1; + else + td->iodepth_low = td->iodepth; + } + + /* + * If batch number isn't set, default to the same as iodepth + */ + if (td->iodepth_batch > td->iodepth || !td->iodepth_batch) + td->iodepth_batch = td->iodepth; + + if (td->open_files > td->nr_files || !td->open_files) + td->open_files = td->nr_files; } /* @@ -751,7 +811,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (td->filename) td->nr_uniq_files = 1; else - td->nr_uniq_files = td->nr_files; + td->nr_uniq_files = td->open_files; if (td->filetype == FIO_TYPE_FILE || td->filename) { char tmp[PATH_MAX]; @@ -770,7 +830,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) len = sprintf(tmp, "%s/", td->directory); } - td->files = malloc(sizeof(struct fio_file) * td->nr_files); + td->files = malloc(sizeof(struct fio_file) * td->open_files); for_each_file(td, f, i) { memset(f, 0, sizeof(*f)); @@ -783,7 +843,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) f->file_name = strdup(tmp); } } else { - td->nr_files = 1; + td->open_files = td->nr_files = 1; td->files = malloc(sizeof(struct fio_file)); f = &td->files[0]; @@ -797,7 +857,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) f->file_offset = td->start_offset; } - fio_sem_init(&td->mutex, 0); + td->mutex = fio_sem_init(0); td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX; td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX; @@ -983,11 +1043,26 @@ static int str_mem_cb(void *data, const char *mem) return 0; } +/* External engines are specified by "external:name.o") */ +static const char *get_engine_name(const char *str) +{ + char *p = strstr(str, ":"); + + if (!p) + return str; + + p++; + strip_blank_front(&p); + strip_blank_end(p); + return p; +} + static int str_ioengine_cb(void *data, const char *str) { struct thread_data *td = data; + const char *name = get_engine_name(str); - td->io_ops = load_ioengine(td, str); + td->io_ops = load_ioengine(td, name); if (td->io_ops) return 0; @@ -1163,7 +1238,7 @@ static int parse_cmd_line(int argc, char *argv[]) struct thread_data *td = NULL; int c, ini_idx = 0, lidx, ret, dont_add_job = 0; - while ((c = getopt_long(argc, argv, "", long_options, &lidx)) != -1) { + while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) { switch (c) { case 't': def_timeout = atoi(optarg);