X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Flibaio.c;h=439cd242dd9e0aab6df2ad65cda1daba35ee0140;hb=b463e9363b826d5ba4f16e0115a26f24b77078f4;hp=871c5a4785d727a72471499ffca93344ff660b1c;hpb=317b95d07d4921d2594a1be6e014c9c2d062fe75;p=fio.git diff --git a/engines/libaio.c b/engines/libaio.c index 871c5a47..439cd242 100644 --- a/engines/libaio.c +++ b/engines/libaio.c @@ -32,10 +32,8 @@ static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u) 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; } @@ -60,15 +58,15 @@ static struct io_u *fio_libaio_event(struct thread_data *td, int event) return io_u; } -static int fio_libaio_getevents(struct thread_data *td, int min, int max, - struct timespec *t) +static int fio_libaio_getevents(struct thread_data *td, unsigned int min, + 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); @@ -86,6 +84,8 @@ static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u) { struct libaio_data *ld = td->io_ops->data; + fio_ro_check(td, io_u); + if (ld->iocbs_nr == (int) td->o.iodepth) return FIO_Q_BUSY; @@ -95,12 +95,19 @@ 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; - if (fsync(io_u->file->fd) < 0) - io_u->error = errno; + 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; + + do_io_u_trim(td, io_u); return FIO_Q_COMPLETED; } @@ -116,6 +123,9 @@ static void fio_libaio_queued(struct thread_data *td, struct io_u **io_us, struct timeval now; unsigned int i; + if (!fio_fill_issue_time(td)) + return; + fio_gettime(&now, NULL); for (i = 0; i < nr; i++) { @@ -131,36 +141,29 @@ static int fio_libaio_commit(struct thread_data *td) struct libaio_data *ld = td->io_ops->data; struct iocb **iocbs; struct io_u **io_us; - int ret, iocbs_nr; + int ret; if (!ld->iocbs_nr) return 0; - iocbs_nr = ld->iocbs_nr; io_us = ld->io_us; iocbs = ld->iocbs; do { - ret = io_submit(ld->aio_ctx, iocbs_nr, iocbs); - if (ret == iocbs_nr) { - fio_libaio_queued(td, io_us, ret); - ret = 0; - break; - } else if (ret > 0) { + 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; - iocbs_nr -= ret; - continue; - } else if (ret == -EAGAIN || !ret) - usleep(100); - else if (ret == -EINTR) + ret = 0; + } else if (!ret || ret == -EAGAIN || ret == -EINTR) { + if (!ret) + io_u_mark_submit(td, ret); continue; - else + } else break; - } while (1); - - if (!ret) - ld->iocbs_nr = 0; + } while (ld->iocbs_nr); return ret; } @@ -182,7 +185,6 @@ static void fio_libaio_cleanup(struct thread_data *td) free(ld->iocbs); free(ld->io_us); free(ld); - td->io_ops->data = NULL; } } @@ -196,6 +198,7 @@ static int fio_libaio_init(struct thread_data *td) 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; } @@ -225,6 +228,7 @@ static struct ioengine_ops ioengine = { .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 */ @@ -236,7 +240,7 @@ static struct ioengine_ops ioengine = { */ 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; }