#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 posixaio_data *pd = td->io_ops_data;
os_aiocb_t *suspend_list[SUSPEND_ENTRIES];
- struct flist_head *entry;
struct timespec start;
int have_timeout = 0;
int suspend_entries;
+ struct io_u *io_u;
unsigned int r;
+ int i;
if (t && !fill_timespec(&start))
have_timeout = 1;
restart:
memset(suspend_list, 0, sizeof(*suspend_list));
suspend_entries = 0;
- flist_for_each(entry, &td->io_u_busylist) {
- struct io_u *io_u = flist_entry(entry, struct io_u, list);
+ 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);
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)
{
- struct posixaio_data *pd = td->io_ops->data;
+ struct posixaio_data *pd = td->io_ops_data;
os_aiocb_t *aiocb = &io_u->aiocb;
int ret;
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;
}
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);
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;
}