OSX: Fixup warnings and clock_gettime() bug

[fio.git] / engines / posixaio.c

diff --git a/engines/posixaio.c b/engines/posixaio.c
index 0966e0d5e7fa66b261c20bb1948177e108ab4455..a943e5bbf6eaad2c953d21f5c9abd431690fdabf 100644 (file)
--- 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)
@@ -93,6 +103,8 @@ static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
 
        if (t && !fill_timespec(&start))
                have_timeout = 1;
+       else
+               memset(&start, 0, sizeof(start));
 
        r = 0;
        memset(suspend_list, 0, sizeof(*suspend_list));
@@ -173,7 +185,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)
@@ -240,27 +252,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);