#define td_var_offset(var) ((size_t) &((struct thread_data *)0)->var)
-static int str_ioengine_cb(void *, const char *);
static int str_mem_cb(void *, const char *);
static int str_lockmem_cb(void *, unsigned long *);
#ifdef FIO_HAVE_IOPRIO
},
{
.name = "ioengine",
- .type = FIO_OPT_STR,
- .cb = str_ioengine_cb,
+ .type = FIO_OPT_STR_STORE,
+ .off1 = td_var_offset(ioengine),
.help = "IO engine to use",
.def = "sync",
.posval = {
.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,
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;
/*
*/
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;
}
/*
return buf;
}
+/* 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;
+}
+
/*
* Adds a job to the list of things todo. Sanitizes the various options
* to make sure we don't have conflicts, and initializes various
struct stat sb;
int numjobs, i;
struct fio_file *f;
+ const char *engine;
/*
* the def_thread is just for options, it's not a real job
if (td == &def_thread)
return 0;
- /*
- * this will later be shared between thread for group reporting
- */
- td->ts = &td->__ts;
- memset(td->ts, 0, sizeof(*td->ts));
-
- assert(td->io_ops);
+ engine = get_engine_name(td->ioengine);
+ td->io_ops = load_ioengine(td, engine);
+ if (!td->io_ops) {
+ log_err("fio: failed to load engine %s\n", engine);
+ return 1;
+ }
if (td->odirect)
td->io_ops->flags |= FIO_RAWIO;
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];
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));
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];
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;
- td->ts->bw_stat[0].min_val = td->ts->bw_stat[1].min_val = ULONG_MAX;
+ 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;
+ td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
if (td->stonewall && td->thread_number > 1)
groupid++;
goto err;
if (td->write_lat_log) {
- setup_log(&td->ts->slat_log);
- setup_log(&td->ts->clat_log);
+ setup_log(&td->ts.slat_log);
+ setup_log(&td->ts.clat_log);
}
if (td->write_bw_log)
- setup_log(&td->ts->bw_log);
+ setup_log(&td->ts.bw_log);
if (!td->name)
td->name = strdup(jobname);
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, name);
- if (td->io_ops)
- return 0;
-
- return 1;
-}
-
static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
{
mlock_size = *val;