engines/libaio: remove remnants of abandoned aio features

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index 0e2263a743ad657244cc61a5a97ba0ba1b5d2e9a..cd5b89f98a36a500f0854a02e68dc228aa7ecbf1 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -8,10 +8,13 @@
 #include <unistd.h>
 #include <errno.h>
 #include <libaio.h>
+#include <sys/time.h>
+#include <sys/resource.h>
 
 #include "../fio.h"
 #include "../lib/pow2.h"
 #include "../optgroup.h"
+#include "../lib/memalign.h"
 
 static int fio_libaio_commit(struct thread_data *td);
 
@@ -21,6 +24,8 @@ struct libaio_data {
        struct iocb **iocbs;
        struct io_u **io_us;
 
+       struct io_u **io_u_index;
+
        /*
         * Basic ring buffer. 'head' is incremented in _queue(), and
         * 'tail' is incremented in _commit(). We keep 'queued' so
@@ -39,6 +44,7 @@ struct libaio_data {
 struct libaio_options {
        void *pad;
        unsigned int userspace_reap;
+       unsigned int hipri;
 };
 
 static struct fio_option options[] = {
@@ -68,13 +74,14 @@ static inline void ring_inc(struct libaio_data *ld, unsigned int *val,
 static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
+       struct iocb *iocb = &io_u->iocb;
 
-       if (io_u->ddir == DDIR_READ)
-               io_prep_pread(&io_u->iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
-       else if (io_u->ddir == DDIR_WRITE)
-               io_prep_pwrite(&io_u->iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
-       else if (ddir_sync(io_u->ddir))
-               io_prep_fsync(&io_u->iocb, f->fd);
+       if (io_u->ddir == DDIR_READ) {
+               io_prep_pread(iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
+       } else if (io_u->ddir == DDIR_WRITE) {
+               io_prep_pwrite(iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
+       } else if (ddir_sync(io_u->ddir))
+               io_prep_fsync(iocb, f->fd);
 
        return 0;
 }
@@ -169,7 +176,8 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
                        events += r;
                else if ((min && r == 0) || r == -EAGAIN) {
                        fio_libaio_commit(td);
-                       usleep(100);
+                       if (actual_min)
+                               usleep(10);
                } else if (r != -EINTR)
                        break;
        } while (events < min);
@@ -177,8 +185,8 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
        return r < 0 ? r : events;
 }
 
-static enum fio_q_status
-fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status fio_libaio_queue(struct thread_data *td,
+                                         struct io_u *io_u)
 {
        struct libaio_data *ld = td->io_ops_data;
 
@@ -206,6 +214,8 @@ fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
                        return FIO_Q_BUSY;
 
                do_io_u_trim(td, io_u);
+               io_u_mark_submit(td, 1);
+               io_u_mark_complete(td, 1);
                return FIO_Q_COMPLETED;
        }
 
@@ -332,30 +342,26 @@ static void fio_libaio_cleanup(struct thread_data *td)
        }
 }
 
-static int fio_libaio_init(struct thread_data *td)
+static int fio_libaio_post_init(struct thread_data *td)
 {
-       struct libaio_options *o = td->eo;
-       struct libaio_data *ld;
-       int err = 0;
-
-       ld = calloc(1, sizeof(*ld));
+       struct libaio_data *ld = td->io_ops_data;
+       int err;
 
-       /*
-        * First try passing in 0 for queue depth, since we don't
-        * care about the user ring. If that fails, the kernel is too old
-        * and we need the right depth.
-        */
-       if (!o->userspace_reap)
-               err = io_queue_init(INT_MAX, &ld->aio_ctx);
-       if (o->userspace_reap || err == -EINVAL)
-               err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
+       err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
        if (err) {
                td_verror(td, -err, "io_queue_init");
-               log_err("fio: check /proc/sys/fs/aio-max-nr\n");
-               free(ld);
                return 1;
        }
 
+       return 0;
+}
+
+static int fio_libaio_init(struct thread_data *td)
+{
+       struct libaio_data *ld;
+
+       ld = calloc(1, sizeof(*ld));
+
        ld->entries = td->o.iodepth;
        ld->is_pow2 = is_power_of_2(ld->entries);
        ld->aio_events = calloc(ld->entries, sizeof(struct io_event));
@@ -369,7 +375,9 @@ static int fio_libaio_init(struct thread_data *td)
 static struct ioengine_ops ioengine = {
        .name                   = "libaio",
        .version                = FIO_IOOPS_VERSION,
+       .flags                  = FIO_ASYNCIO_SYNC_TRIM,
        .init                   = fio_libaio_init,
+       .post_init              = fio_libaio_post_init,
        .prep                   = fio_libaio_prep,
        .queue                  = fio_libaio_queue,
        .commit                 = fio_libaio_commit,