Move Windows port to MinGW

[fio.git] / os / os-mac.h

diff --git a/os/os-mac.h b/os/os-mac.h
index 80c49f474e007ea461bd22eb30d16d5b646125de..553f82007fae7c23a83a5b89ac77108907e2cb18 100644 (file)
--- a/os/os-mac.h
+++ b/os/os-mac.h
@@ -27,6 +27,7 @@
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_CLOCK_MONOTONIC
 #define FIO_USE_GENERIC_RAND
+#define FIO_USE_GENERIC_INIT_RANDOM_STATE
 #define FIO_HAVE_GETTID
 #define FIO_HAVE_CHARDEV_SIZE
 
@@ -69,17 +70,6 @@ struct itimerspec {
 static struct sigevent fio_timers[MAX_TIMERS];
 static unsigned int num_timers = 0;
 
-static inline int timer_create(clockid_t clockid, struct sigevent *restrict evp,
-                                timer_t *restrict timerid)
-{
-       int current_timer = num_timers;
-       fio_timers[current_timer] = *evp;
-       num_timers++;
-       
-       *timerid = current_timer;
-       return 0;
-}
-
 static void sig_alrm(int signum)
 {
        union sigval sv;
@@ -96,7 +86,8 @@ static void sig_alrm(int signum)
 }
 
 static inline int timer_settime(timer_t timerid, int flags,
-                                                               const struct itimerspec *value, struct itimerspec *ovalue)
+                               const struct itimerspec *value,
+                               struct itimerspec *ovalue)
 {
        struct sigaction sa;
        struct itimerval tv;
@@ -143,13 +134,17 @@ static inline int fio_set_odirect(int fd)
 
 static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
 {
-    uint64_t temp = 1;
-    if (ioctl(f->fd, DKIOCGETBLOCKCOUNT, bytes) == -1)
+       uint32_t block_size;
+       uint64_t block_count;
+
+       if (ioctl(f->fd, DKIOCGETBLOCKCOUNT, &block_count) == -1)
                return errno;
-    if (ioctl(f->fd, DKIOCGETBLOCKSIZE, &temp) == -1)
+       if (ioctl(f->fd, DKIOCGETBLOCKSIZE, &block_size) == -1)
                return errno;
-    (*bytes) *= temp;
-    return 0;
+
+       *bytes = block_size;
+       *bytes *= block_count;
+       return 0;
 }
 
 static inline int chardev_size(struct fio_file *f, unsigned long long *bytes)