X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=ioengines.c;h=16ea928fe727c094f651e75922f52308eb36c70a;hp=2ed274988aa43f36474ed63f547cd042d02cf1f5;hb=d2d7fa53c18f1fc3fb89f3fe20df9b39986bde72;hpb=429ca0735f71961ffe52c5ac102b0a14ee1b2c4c diff --git a/ioengines.c b/ioengines.c index 2ed27498..16ea928f 100644 --- a/ioengines.c +++ b/ioengines.c @@ -33,16 +33,27 @@ static int check_engine_ops(struct ioengine_ops *ops) if (ops->flags & FIO_CPUIO) return 0; + if (!ops->queue) { + log_err("%s: no queue handler\n", ops->name); + return 1; + } + + /* + * sync engines only need a ->queue() + */ + if (ops->flags & FIO_SYNCIO) + return 0; + if (!ops->event) { - log_err("%s: no event handler)\n", ops->name); + log_err("%s: no event handler\n", ops->name); return 1; } if (!ops->getevents) { - log_err("%s: no getevents handler)\n", ops->name); + log_err("%s: no getevents handler\n", ops->name); return 1; } if (!ops->queue) { - log_err("%s: no queue handler)\n", ops->name); + log_err("%s: no queue handler\n", ops->name); return 1; } @@ -159,8 +170,8 @@ void close_ioengine(struct thread_data *td) int td_io_prep(struct thread_data *td, struct io_u *io_u) { - if (td->io_ops->prep && td->io_ops->prep(td, io_u)) - return 1; + if (td->io_ops->prep) + return td->io_ops->prep(td, io_u); return 0; } @@ -168,13 +179,19 @@ int td_io_prep(struct thread_data *td, struct io_u *io_u) int td_io_getevents(struct thread_data *td, int min, int max, struct timespec *t) { - return td->io_ops->getevents(td, min, max, t); + if (td->io_ops->getevents) + return td->io_ops->getevents(td, min, max, t); + + return 0; } int td_io_queue(struct thread_data *td, struct io_u *io_u) { fio_gettime(&io_u->issue_time, NULL); + if (io_u->ddir != DDIR_SYNC) + td->io_issues[io_u->ddir]++; + return td->io_ops->queue(td, io_u); } @@ -185,3 +202,11 @@ int td_io_init(struct thread_data *td) return 0; } + +int td_io_commit(struct thread_data *td) +{ + if (td->io_ops->commit) + return td->io_ops->commit(td); + + return 0; +}