#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
-#include <assert.h>
+#include <fcntl.h>
#include "../fio.h"
struct posixaio_data {
struct io_u **aio_events;
+ unsigned int queued;
};
static int fill_timespec(struct timespec *ts)
{
struct posixaio_data *pd = td->io_ops->data;
struct aiocb *suspend_list[SUSPEND_ENTRIES];
- struct list_head *entry;
+ struct flist_head *entry;
struct timespec start;
int have_timeout = 0;
int suspend_entries = 0;
have_timeout = 1;
r = 0;
- suspend_list[0] = NULL;
+ memset(suspend_list, 0, sizeof(*suspend_list));
restart:
- list_for_each(entry, &td->io_u_busylist) {
- struct io_u *io_u = list_entry(entry, struct io_u, list);
+ flist_for_each(entry, &td->io_u_busylist) {
+ struct io_u *io_u = flist_entry(entry, struct io_u, list);
int err;
if (io_u->seen)
}
io_u->seen = 1;
+ pd->queued--;
pd->aio_events[r++] = io_u;
if (err == ECANCELED)
static int fio_posixaio_queue(struct thread_data fio_unused *td,
struct io_u *io_u)
{
+ struct posixaio_data *pd = td->io_ops->data;
struct aiocb *aiocb = &io_u->aiocb;
int ret;
ret = aio_read(aiocb);
else if (io_u->ddir == DDIR_WRITE)
ret = aio_write(aiocb);
- else
+ else {
+#ifdef FIO_HAVE_POSIXAIO_FSYNC
ret = aio_fsync(O_SYNC, aiocb);
+#else
+ if (pd->queued)
+ return FIO_Q_BUSY;
+
+ if (fsync(io_u->file->fd) < 0)
+ io_u->error = errno;
+ return FIO_Q_COMPLETED;
+#endif
+ }
+
if (ret) {
io_u->error = errno;
td_verror(td, io_u->error, "xfer");
return FIO_Q_COMPLETED;
}
+ pd->queued++;
return FIO_Q_QUEUED;
}
if (pd) {
free(pd->aio_events);
free(pd);
- td->io_ops->data = NULL;
}
}
.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 */