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 (io_u->ddir == DDIR_SYNC)
+ else if (ddir_sync(io_u->ddir))
io_prep_fsync(&io_u->iocb, f->fd);
else
return 1;
unsigned int max, struct timespec *t)
{
struct libaio_data *ld = td->io_ops->data;
- long r;
+ int r;
do {
r = io_getevents(ld->aio_ctx, min, max, ld->aio_events, t);
- if (r >= min)
+ if (r >= (int) min)
break;
else if (r == -EAGAIN) {
usleep(100);
* support aio fsync yet. So return busy for the case where we
* have pending io, to let fio complete those first.
*/
- if (io_u->ddir == DDIR_SYNC) {
+ if (ddir_sync(io_u->ddir)) {
if (ld->iocbs_nr)
return FIO_Q_BUSY;
- if (fsync(io_u->file->fd) < 0)
- io_u->error = errno;
+ do_io_u_sync(td, io_u);
return FIO_Q_COMPLETED;
}
struct timeval now;
unsigned int i;
+ if (!fio_fill_issue_time(td))
+ return;
+
fio_gettime(&now, NULL);
for (i = 0; i < nr; i++) {
ret = io_submit(ld->aio_ctx, ld->iocbs_nr, iocbs);
if (ret > 0) {
fio_libaio_queued(td, io_us, ret);
+ io_u_mark_submit(td, ret);
ld->iocbs_nr -= ret;
io_us += ret;
iocbs += ret;
ret = 0;
- } else if (!ret || ret == -EAGAIN || ret == -EINTR)
+ } else if (!ret || ret == -EAGAIN || ret == -EINTR) {
+ if (!ret)
+ io_u_mark_submit(td, ret);
continue;
- else
+ } else
break;
} while (ld->iocbs_nr);
free(ld->iocbs);
free(ld->io_us);
free(ld);
- td->io_ops->data = NULL;
}
}
static int fio_libaio_init(struct thread_data *td)
{
struct libaio_data *ld = malloc(sizeof(*ld));
- static int warn_print;
int err;
- if (td->o.iodepth > 1 && !td->o.odirect && !warn_print) {
- log_info("fio: libaio engine is only async for non-buffered IO\n");
- warn_print = 1;
- }
-
memset(ld, 0, sizeof(*ld));
err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
.cleanup = fio_libaio_cleanup,
.open_file = generic_open_file,
.close_file = generic_close_file,
+ .get_file_size = generic_get_file_size,
};
#else /* FIO_HAVE_LIBAIO */