Makefile: libdir is not used anymore

[fio.git] / ioengines.c

diff --git a/ioengines.c b/ioengines.c
index 1666612a9bf6dbe121e1c8a87c682e61786af228..ab5b2245131fb1abb5d2e6b51a94227522e78991 100644 (file)
--- 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->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) {
        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) {
                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) {
                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;
        }
                
                return 1;
        }
                


@@ -55,14 +66,10 @@ void unregister_ioengine(struct ioengine_ops *ops)
        INIT_LIST_HEAD(&ops->list);
 }
 
        INIT_LIST_HEAD(&ops->list);
 }
 

-int register_ioengine(struct ioengine_ops *ops)
+void register_ioengine(struct ioengine_ops *ops)

 {
 {

-       if (check_engine_ops(ops))
-               return 1;
-

        INIT_LIST_HEAD(&ops->list);
        list_add_tail(&ops->list, &engine_list);
        INIT_LIST_HEAD(&ops->list);
        list_add_tail(&ops->list, &engine_list);

-       return 0;

 }
 
 static struct ioengine_ops *find_ioengine(const char *name)
 }
 
 static struct ioengine_ops *find_ioengine(const char *name)


@@ -162,8 +169,8 @@ void close_ioengine(struct thread_data *td)
 
 int td_io_prep(struct thread_data *td, struct io_u *io_u)
 {
 
 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;
 }
 
        return 0;
 }


@@ -171,14 +178,28 @@ 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)
 {
 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)
 {
 }
 
 int td_io_queue(struct thread_data *td, struct io_u *io_u)
 {

-       fio_gettime(&io_u->issue_time, NULL);
+       int ret;
+
+       if (td->io_ops->flags & FIO_SYNCIO)
+               fio_gettime(&io_u->issue_time, NULL);
+
+       if (io_u->ddir != DDIR_SYNC)
+               td->io_issues[io_u->ddir]++;
+
+       ret = td->io_ops->queue(td, io_u);
+
+       if ((td->io_ops->flags & FIO_SYNCIO) == 0)
+               fio_gettime(&io_u->issue_time, NULL);

 
 

-       return td->io_ops->queue(td, io_u);
+       return ret;

 }
 
 int td_io_init(struct thread_data *td)
 }
 
 int td_io_init(struct thread_data *td)


@@ -188,3 +209,11 @@ int td_io_init(struct thread_data *td)
 
        return 0;
 }
 
        return 0;
 }

+
+int td_io_commit(struct thread_data *td)
+{
+       if (td->io_ops->commit)
+               return td->io_ops->commit(td);
+
+       return 0;
+}