X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fposixaio.c;h=135d088c7a029ef1ac3e55192d724d147875bbe7;hb=fab60fa78a1832c17f8bb200292ded4a8b3eb2a5;hp=a84eb773f5a883356f5ea1891bf81da1e7749187;hpb=def1d8e3019d8757b8214691013880ebb414d396;p=fio.git diff --git a/engines/posixaio.c b/engines/posixaio.c index a84eb773..135d088c 100644 --- a/engines/posixaio.c +++ b/engines/posixaio.c @@ -12,42 +12,19 @@ #include "../fio.h" -#ifdef FIO_HAVE_POSIXAIO - struct posixaio_data { struct io_u **aio_events; unsigned int queued; }; -static int fill_timespec(struct timespec *ts) +static unsigned long long ts_utime_since_now(const struct timespec *start) { -#ifdef _POSIX_TIMERS - if (!clock_gettime(CLOCK_MONOTONIC, ts)) - return 0; - - perror("clock_gettime"); -#endif - return 1; -} - -static unsigned long long ts_utime_since_now(struct timespec *t) -{ - long long sec, nsec; struct timespec now; - if (fill_timespec(&now)) + if (fio_get_mono_time(&now) < 0) return 0; - - sec = now.tv_sec - t->tv_sec; - nsec = now.tv_nsec - t->tv_nsec; - if (sec > 0 && nsec < 0) { - sec--; - nsec += 1000000000; - } - sec *= 1000000; - nsec /= 1000; - return sec + nsec; + return utime_since(start, &now); } static int fio_posixaio_cancel(struct thread_data fio_unused *td, @@ -65,13 +42,14 @@ static int fio_posixaio_cancel(struct thread_data fio_unused *td, static int fio_posixaio_prep(struct thread_data fio_unused *td, struct io_u *io_u) { - struct aiocb *aiocb = &io_u->aiocb; + os_aiocb_t *aiocb = &io_u->aiocb; struct fio_file *f = io_u->file; aiocb->aio_fildes = f->fd; aiocb->aio_buf = io_u->xfer_buf; aiocb->aio_nbytes = io_u->xfer_buflen; aiocb->aio_offset = io_u->offset; + aiocb->aio_sigevent.sigev_notify = SIGEV_NONE; io_u->seen = 0; return 0; @@ -80,27 +58,30 @@ static int fio_posixaio_prep(struct thread_data fio_unused *td, #define SUSPEND_ENTRIES 8 static int fio_posixaio_getevents(struct thread_data *td, unsigned int min, - unsigned int max, struct timespec *t) + unsigned int max, const struct timespec *t) { - struct posixaio_data *pd = td->io_ops->data; - struct aiocb *suspend_list[SUSPEND_ENTRIES]; - struct flist_head *entry; + struct posixaio_data *pd = td->io_ops_data; + os_aiocb_t *suspend_list[SUSPEND_ENTRIES]; struct timespec start; int have_timeout = 0; - int suspend_entries = 0; + int suspend_entries; + struct io_u *io_u; unsigned int r; + int i; - if (t && !fill_timespec(&start)) + if (t && fio_get_mono_time(&start) == 0) have_timeout = 1; + else + memset(&start, 0, sizeof(start)); r = 0; - memset(suspend_list, 0, sizeof(*suspend_list)); restart: - flist_for_each(entry, &td->io_u_busylist) { - struct io_u *io_u = flist_entry(entry, struct io_u, list); + memset(suspend_list, 0, sizeof(suspend_list)); + suspend_entries = 0; + io_u_qiter(&td->io_u_all, io_u, i) { int err; - if (io_u->seen) + if (io_u->seen || !(io_u->flags & IO_U_F_FLIGHT)) continue; err = aio_error(&io_u->aiocb); @@ -140,23 +121,23 @@ restart: /* * must have some in-flight, wait for at least one */ - aio_suspend((const struct aiocb * const *)suspend_list, + aio_suspend((const os_aiocb_t * const *)suspend_list, suspend_entries, t); goto restart; } static struct io_u *fio_posixaio_event(struct thread_data *td, int event) { - struct posixaio_data *pd = td->io_ops->data; + struct posixaio_data *pd = td->io_ops_data; return pd->aio_events[event]; } -static int fio_posixaio_queue(struct thread_data *td, - struct io_u *io_u) +static enum fio_q_status fio_posixaio_queue(struct thread_data *td, + struct io_u *io_u) { - struct posixaio_data *pd = td->io_ops->data; - struct aiocb *aiocb = &io_u->aiocb; + struct posixaio_data *pd = td->io_ops_data; + os_aiocb_t *aiocb = &io_u->aiocb; int ret; fio_ro_check(td, io_u); @@ -172,7 +153,7 @@ static int fio_posixaio_queue(struct thread_data *td, do_io_u_trim(td, io_u); return FIO_Q_COMPLETED; } else { -#ifdef FIO_HAVE_POSIXAIO_FSYNC +#ifdef CONFIG_POSIXAIO_FSYNC ret = aio_fsync(O_SYNC, aiocb); #else if (pd->queued) @@ -182,18 +163,20 @@ static int fio_posixaio_queue(struct thread_data *td, return FIO_Q_COMPLETED; #endif } - + if (ret) { + int aio_err = errno; + /* * At least OSX has a very low limit on the number of pending * IOs, so if it returns EAGAIN, we are out of resources * to queue more. Just return FIO_Q_BUSY to naturally * drop off at this depth. */ - if (errno == EAGAIN) + if (aio_err == EAGAIN) return FIO_Q_BUSY; - io_u->error = errno; + io_u->error = aio_err; td_verror(td, io_u->error, "xfer"); return FIO_Q_COMPLETED; } @@ -204,7 +187,7 @@ static int fio_posixaio_queue(struct thread_data *td, static void fio_posixaio_cleanup(struct thread_data *td) { - struct posixaio_data *pd = td->io_ops->data; + struct posixaio_data *pd = td->io_ops_data; if (pd) { free(pd->aio_events); @@ -220,13 +203,14 @@ static int fio_posixaio_init(struct thread_data *td) pd->aio_events = malloc(td->o.iodepth * sizeof(struct io_u *)); memset(pd->aio_events, 0, td->o.iodepth * sizeof(struct io_u *)); - td->io_ops->data = pd; + td->io_ops_data = pd; return 0; } static struct ioengine_ops ioengine = { .name = "posixaio", .version = FIO_IOOPS_VERSION, + .flags = FIO_ASYNCIO_SYNC_TRIM, .init = fio_posixaio_init, .prep = fio_posixaio_prep, .queue = fio_posixaio_queue, @@ -239,27 +223,6 @@ static struct ioengine_ops ioengine = { .get_file_size = generic_get_file_size, }; -#else /* FIO_HAVE_POSIXAIO */ - -/* - * When we have a proper configure system in place, we simply wont build - * and install this io engine. For now install a crippled version that - * just complains and fails to load. - */ -static int fio_posixaio_init(struct thread_data fio_unused *td) -{ - log_err("fio: posixaio not available\n"); - return 1; -} - -static struct ioengine_ops ioengine = { - .name = "posixaio", - .version = FIO_IOOPS_VERSION, - .init = fio_posixaio_init, -}; - -#endif - static void fio_init fio_posixaio_register(void) { register_ioengine(&ioengine);