X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fposixaio.c;h=bddb1ec3f2697e43dff46dcc726ed31e419f27f0;hp=e315e972b73df4d085f220fb54ed4bc276083de9;hb=f70afaca743f2971312d9928f069a9ea7daeccf7;hpb=9918be5a9bfe2819cccdb9f975f2b9d4d36f3f70

diff --git a/engines/posixaio.c b/engines/posixaio.c
index e315e972..bddb1ec3 100644
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -12,8 +12,6 @@
 
 #include "../fio.h"
 
-#ifdef FIO_HAVE_POSIXAIO
-
 struct posixaio_data {
 	struct io_u **aio_events;
 	unsigned int queued;
@@ -21,13 +19,25 @@ struct posixaio_data {
 
 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)
@@ -65,7 +75,7 @@ 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;
@@ -81,27 +91,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))
 		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);
@@ -141,14 +154,14 @@ 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];
 }
@@ -156,8 +169,8 @@ static struct io_u *fio_posixaio_event(struct thread_data *td, int event)
 static int 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);
@@ -173,7 +186,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)
@@ -183,18 +196,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;
 	}
@@ -205,7 +220,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);
@@ -221,7 +236,7 @@ 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;
 }
 
@@ -240,27 +255,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);