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;
return 0;
}
unsigned int max, struct timespec *t)
{
struct libaio_data *ld = td->io_ops->data;
- int r;
+ unsigned actual_min = td->o.iodepth_batch_complete == 0 ? 0 : min;
+ int r, events = 0;
do {
- r = io_getevents(ld->aio_ctx, min, max, ld->aio_events, t);
- if (r >= (int) min)
- break;
- else if (r == -EAGAIN) {
+ r = io_getevents(ld->aio_ctx, actual_min, max, ld->aio_events + events, t);
+ if (r >= 0)
+ events += r;
+ else if (r == -EAGAIN)
usleep(100);
- continue;
- } else if (r == -EINTR)
- continue;
- else if (r != 0)
- break;
- } while (1);
+ } while (events < min);
- return r;
+ return r < 0 ? r : events;
}
static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
* 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;
+
+ do_io_u_sync(td, io_u);
+ return FIO_Q_COMPLETED;
+ }
+
+ if (io_u->ddir == DDIR_TRIM) {
if (ld->iocbs_nr)
return FIO_Q_BUSY;
- if (fsync(io_u->file->fd) < 0)
- io_u->error = errno;
+ do_io_u_trim(td, io_u);
return FIO_Q_COMPLETED;
}
*/
static int fio_libaio_init(struct thread_data fio_unused *td)
{
- fprintf(stderr, "fio: libaio not available\n");
+ log_err("fio: libaio not available\n");
return 1;
}