X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fposixaio.c;h=a2b53873124b49cdcc6e14b9d7e508b948265091;hb=954cd73a9a93102c24afa869fbe67ac38af6e416;hp=95141750a26466d8e8f4c6894e3716fa7bac3a4d;hpb=3c77037e67c4a4af29e12f760db2541bad6c5898;p=fio.git diff --git a/engines/posixaio.c b/engines/posixaio.c index 95141750..a2b53873 100644 --- a/engines/posixaio.c +++ b/engines/posixaio.c @@ -8,25 +8,36 @@ #include #include #include -#include +#include #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) { -#ifdef _POSIX_TIMERS - if (!clock_gettime(CLOCK_MONOTONIC, ts)) +#ifdef CONFIG_CLOCK_GETTIME +#ifdef CONFIG_CLOCK_MONOTONIC + clockid_t clk = CLOCK_MONOTONIC; +#else + clockid_t clk = CLOCK_REALTIME; +#endif + if (!clock_gettime(clk, ts)) return 0; perror("clock_gettime"); -#endif return 1; +#else + struct timeval tv; + + gettimeofday(&tv, NULL); + ts->tv_sec = tv.tv_sec; + ts->tv_nsec = tv.tv_usec * 1000; + return 0; +#endif } static unsigned long long ts_utime_since_now(struct timespec *t) @@ -55,7 +66,7 @@ static int fio_posixaio_cancel(struct thread_data fio_unused *td, struct fio_file *f = io_u->file; int r = aio_cancel(f->fd, &io_u->aiocb); - if (r == 1 || r == AIO_CANCELED) + if (r == AIO_ALLDONE || r == AIO_CANCELED) return 0; return 1; @@ -64,13 +75,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; @@ -82,24 +94,27 @@ static int fio_posixaio_getevents(struct thread_data *td, unsigned int min, unsigned int max, struct timespec *t) { struct posixaio_data *pd = td->io_ops->data; - struct aiocb *suspend_list[SUSPEND_ENTRIES]; - struct list_head *entry; + 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)) have_timeout = 1; + else + memset(&start, 0, sizeof(start)); r = 0; - suspend_list[0] = NULL; restart: - list_for_each(entry, &td->io_u_busylist) { - struct io_u *io_u = list_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); @@ -112,6 +127,7 @@ restart: } io_u->seen = 1; + pd->queued--; pd->aio_events[r++] = io_u; if (err == ECANCELED) @@ -122,9 +138,6 @@ restart: io_u->resid = io_u->xfer_buflen - retval; } else io_u->error = err; - - if (r >= max) - break; } if (r >= min) @@ -141,7 +154,7 @@ 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; } @@ -153,10 +166,11 @@ static struct io_u *fio_posixaio_event(struct thread_data *td, int event) return pd->aio_events[event]; } -static int fio_posixaio_queue(struct thread_data fio_unused *td, +static int fio_posixaio_queue(struct thread_data *td, struct io_u *io_u) { - 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); @@ -165,15 +179,40 @@ static int fio_posixaio_queue(struct thread_data fio_unused *td, ret = aio_read(aiocb); else if (io_u->ddir == DDIR_WRITE) ret = aio_write(aiocb); - else + else if (io_u->ddir == DDIR_TRIM) { + if (pd->queued) + return FIO_Q_BUSY; + + do_io_u_trim(td, io_u); + return FIO_Q_COMPLETED; + } else { +#ifdef CONFIG_POSIXAIO_FSYNC ret = aio_fsync(O_SYNC, aiocb); +#else + if (pd->queued) + return FIO_Q_BUSY; + do_io_u_sync(td, io_u); + return FIO_Q_COMPLETED; +#endif + } + if (ret) { + /* + * 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) + return FIO_Q_BUSY; + io_u->error = errno; td_verror(td, io_u->error, "xfer"); return FIO_Q_COMPLETED; } + pd->queued++; return FIO_Q_QUEUED; } @@ -184,7 +223,6 @@ static void fio_posixaio_cleanup(struct thread_data *td) if (pd) { free(pd->aio_events); free(pd); - td->io_ops->data = NULL; } } @@ -212,29 +250,9 @@ static struct ioengine_ops ioengine = { .cleanup = fio_posixaio_cleanup, .open_file = generic_open_file, .close_file = generic_close_file, + .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) -{ - fprintf(stderr, "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);