#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 = {
#ifdef FIO_HAVE_SYSLET
{ .ival = "syslet-rw", },
#endif
+ { .ival = "cpuio", },
{ .ival = "external", },
},
},
.name = "cpuchunks",
.type = FIO_OPT_INT,
.off1 = td_var_offset(cpucycle),
- .help = "Length of the CPU burn cycles",
+ .help = "Length of the CPU burn cycles (usecs)",
+ .def = "50000",
},
#ifdef FIO_HAVE_CPU_AFFINITY
{
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;
- 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->filename = strdup(jobname);
+
td->filetype = FIO_TYPE_FILE;
- if (td->filename && !lstat(td->filename, &sb)) {
+ if (!lstat(td->filename, &sb)) {
if (S_ISBLK(sb.st_mode))
td->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
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;
if (!terse_output) {
if (!job_add_num) {
- if (td->io_ops->flags & FIO_CPUIO)
+ if (!strcmp(td->io_ops->name, "cpuio"))
fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
else {
char *c1, *c2, *c3, *c4;
int fd, num_maps, blocks, i;
struct fio_file *f;
- if (td->io_ops->flags & FIO_CPUIO)
+ if (td->io_ops->flags & FIO_DISKLESSIO)
return 0;
fd = open("/dev/urandom", O_RDONLY);
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;