Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 0b3ec16485124df5eb3e3e7396e0208a4cd4ac27..a395da15a95c113fb241981eb84b1fc32c009fd0 100644 (file)
--- a/ioengines.c
+++ b/ioengines.c
@@ -77,16 +77,10 @@ static struct ioengine_ops *find_ioengine(const char *name)
 {
        struct ioengine_ops *ops;
        struct list_head *entry;
-       char engine[16];
-
-       strncpy(engine, name, sizeof(engine) - 1);
-
-       if (!strncmp(engine, "linuxaio", 8) || !strncmp(engine, "aio", 3))
-               strcpy(engine, "libaio");
 
        list_for_each(entry, &engine_list) {
                ops = list_entry(entry, struct ioengine_ops, list);
-               if (!strcmp(engine, ops->name))
+               if (!strcmp(name, ops->name))
                        return ops;
        }
 
@@ -182,6 +176,12 @@ 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)
 {
+       if (min > 0 && td->io_ops->commit) {
+               int r = td->io_ops->commit(td);
+
+               if (r < 0)
+                       return r;
+       }
        if (td->io_ops->getevents)
                return td->io_ops->getevents(td, min, max, t);
 
@@ -195,6 +195,9 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
        assert((io_u->flags & IO_U_F_FLIGHT) == 0);
        io_u->flags |= IO_U_F_FLIGHT;
 
+       io_u->error = 0;
+       io_u->resid = 0;
+
        if (td->io_ops->flags & FIO_SYNCIO) {
                fio_gettime(&io_u->issue_time, NULL);
 
@@ -210,6 +213,17 @@ int td_io_queue(struct thread_data *td, struct io_u *io_u)
 
        ret = td->io_ops->queue(td, io_u);
 
+       if (ret == FIO_Q_QUEUED) {
+               int r;
+
+               td->io_u_queued++;
+               if (td->io_u_queued > td->iodepth_batch) {
+                       r = td_io_commit(td);
+                       if (r < 0)
+                               return r;
+               }
+       }
+
        if ((td->io_ops->flags & FIO_SYNCIO) == 0) {
                fio_gettime(&io_u->issue_time, NULL);
 
@@ -236,6 +250,8 @@ int td_io_commit(struct thread_data *td)
 {
        if (!td->cur_depth)
                return 0;
+
+       td->io_u_queued = 0;
        if (td->io_ops->commit)
                return td->io_ops->commit(td);