Merge branch 'arm-detect-pmull' of https://github.com/sitsofe/fio

[fio.git] / engines / posixaio.c

diff --git a/engines/posixaio.c b/engines/posixaio.c
index 29bcc5acc809f63fc7c46972564a5e696543ef78..135d088c7a029ef1ac3e55192d724d147875bbe7 100644 (file)
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -17,47 +17,14 @@ struct posixaio_data {
        unsigned int queued;
 };
 
-static int fill_timespec(struct timespec *ts)
+static unsigned long long ts_utime_since_now(const struct timespec *start)
 {
-#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");
-       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)
-{
-       long long sec, nsec;
        struct timespec now;
 
-       if (fill_timespec(&now))
+       if (fio_get_mono_time(&now) < 0)
                return 0;
-       
-       sec = now.tv_sec - t->tv_sec;
-       nsec = now.tv_nsec - t->tv_nsec;
-       if (sec > 0 && nsec < 0) {
-               sec--;
-               nsec += 1000000000;
-       }
 
-       sec *= 1000000;
-       nsec /= 1000;
-       return sec + nsec;
+       return utime_since(start, &now);
 }
 
 static int fio_posixaio_cancel(struct thread_data fio_unused *td,
@@ -93,7 +60,7 @@ static int fio_posixaio_prep(struct thread_data fio_unused *td,
 static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
                                  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 timespec start;
        int have_timeout = 0;
@@ -102,14 +69,14 @@ static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
        unsigned int r;
        int i;
 
-       if (t && !fill_timespec(&start))
+       if (t && fio_get_mono_time(&start) == 0)
                have_timeout = 1;
        else
                memset(&start, 0, sizeof(start));
 
        r = 0;
 restart:
-       memset(suspend_list, 0, sizeof(*suspend_list));
+       memset(suspend_list, 0, sizeof(suspend_list));
        suspend_entries = 0;
        io_u_qiter(&td->io_u_all, io_u, i) {
                int err;
@@ -161,15 +128,15 @@ 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];
 }
 
-static int fio_posixaio_queue(struct thread_data *td,
-                             struct io_u *io_u)
+static enum fio_q_status 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;
 
@@ -220,7 +187,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);
@@ -236,13 +203,14 @@ 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;
 }
 
 static struct ioengine_ops ioengine = {
        .name           = "posixaio",
        .version        = FIO_IOOPS_VERSION,
+       .flags          = FIO_ASYNCIO_SYNC_TRIM,
        .init           = fio_posixaio_init,
        .prep           = fio_posixaio_prep,
        .queue          = fio_posixaio_queue,