man page: Fix read_beyond_wp description

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index 2a4d653467849e0d764c8a0c279e15264f13c690..cd5b89f98a36a500f0854a02e68dc228aa7ecbf1 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -8,17 +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"
-
-#ifndef IOCB_FLAG_HIPRI
-#define IOCB_FLAG_HIPRI        (1 << 2)
-#endif
-#ifndef IOCTX_FLAG_IOPOLL
-#define IOCTX_FLAG_IOPOLL      (1 << 0)
-#endif
+#include "../lib/memalign.h"
 
 static int fio_libaio_commit(struct thread_data *td);
 
@@ -28,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
@@ -59,15 +57,6 @@ static struct fio_option options[] = {
                .category = FIO_OPT_C_ENGINE,
                .group  = FIO_OPT_G_LIBAIO,
        },
-       {
-               .name   = "hipri",
-               .lname  = "High Priority",
-               .type   = FIO_OPT_STR_SET,
-               .off1   = offsetof(struct libaio_options, hipri),
-               .help   = "Use polled IO completions",
-               .category = FIO_OPT_C_ENGINE,
-               .group  = FIO_OPT_G_LIBAIO,
-       },
        {
                .name   = NULL,
        },
@@ -85,18 +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 libaio_options *o = td->eo;
+       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);
-               if (o->hipri)
-                       io_u->iocb.u.c.flags |= IOCB_FLAG_HIPRI;
+               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(&io_u->iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
-               if (o->hipri)
-                       io_u->iocb.u.c.flags |= IOCB_FLAG_HIPRI;
+               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(&io_u->iocb, f->fd);
+               io_prep_fsync(iocb, f->fd);
 
        return 0;
 }
@@ -357,46 +342,26 @@ static void fio_libaio_cleanup(struct thread_data *td)
        }
 }
 
-static int fio_libaio_queue_init(struct libaio_data *ld, unsigned int depth,
-                                bool hipri)
+static int fio_libaio_post_init(struct thread_data *td)
 {
-#ifdef __NR_sys_io_setup2
-       int flags = 0;
-
-       if (hipri)
-               flags = IOCTX_FLAG_IOPOLL;
+       struct libaio_data *ld = td->io_ops_data;
+       int err;
 
-       return syscall(__NR_sys_io_setup2, depth, flags, &ld->aio_ctx);
-#else
-       if (hipri) {
-               log_err("fio: polled aio not available on your platform\n");
+       err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
+       if (err) {
+               td_verror(td, -err, "io_queue_init");
                return 1;
        }
-       return io_queue_init(depth, &ld->aio_ctx);
-#endif
+
+       return 0;
 }
 
 static int fio_libaio_init(struct thread_data *td)
 {
-       struct libaio_options *o = td->eo;
        struct libaio_data *ld;
-       int err = 0;
 
        ld = calloc(1, sizeof(*ld));
 
-       /*
-        * 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.
-        */
-       err = fio_libaio_queue_init(ld, td->o.iodepth, o->hipri);
-       if (err) {
-               td_verror(td, -err, "io_queue_init");
-               log_err("fio: check /proc/sys/fs/aio-max-nr\n");
-               free(ld);
-               return 1;
-       }
-
        ld->entries = td->o.iodepth;
        ld->is_pow2 = is_power_of_2(ld->entries);
        ld->aio_events = calloc(ld->entries, sizeof(struct io_event));
@@ -410,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,