#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"
-
-#define IOCB_CMD_PREAD_POLL 9
-#define IOCB_CMD_PWRITE_POLL 10
+#include "../lib/memalign.h"
static int fio_libaio_commit(struct thread_data *td);
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
.category = FIO_OPT_C_ENGINE,
.group = FIO_OPT_G_LIBAIO,
},
- {
- .name = "hipri",
- .lname = "RWF_HIPRI",
- .type = FIO_OPT_STR_SET,
- .off1 = offsetof(struct libaio_options, hipri),
- .help = "Set RWF_HIPRI for pwritev2/preadv2",
- .category = FIO_OPT_C_ENGINE,
- .group = FIO_OPT_G_LIBAIO,
- },
{
.name = NULL,
},
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.aio_lio_opcode = IOCB_CMD_PREAD_POLL;
+ 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.aio_lio_opcode = IOCB_CMD_PWRITE_POLL;
+ 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;
}
}
}
-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));
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,