Deprecate verifysort and verifysort_nr

[fio.git] / engines / posixaio.c

diff --git a/engines/posixaio.c b/engines/posixaio.c
index 0872f9aebbe9ab59bd9d0e21b0ac089b0b1da8e4..bddb1ec3f2697e43dff46dcc726ed31e419f27f0 100644 (file)
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -19,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)
@@ -79,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 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 = 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);
@@ -146,7 +161,7 @@ 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];
 }
@@ -154,7 +169,7 @@ 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 posixaio_data *pd = td->io_ops_data;
        os_aiocb_t *aiocb = &io_u->aiocb;
        int ret;
 
@@ -181,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;
        }
@@ -203,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);
@@ -219,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;
 }