Fix some issues with the OSX port

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/compiler/compiler.h b/compiler/compiler.h
index 0a08bb12a238703ed252b62c451beac6406f695e..c1923ddd8e6019025d631f6d2ba4a648e7c8a469 100644 (file)
--- a/compiler/compiler.h
+++ b/compiler/compiler.h
@@ -15,6 +15,8 @@
 
 #define uninitialized_var(x) x = x
 
+#ifndef __weak
 #define __weak __attribute__((weak))
+#endif
 
 #endif

diff --git a/helpers.c b/helpers.c
index 9c76d305ba51ba6b35fdd8a6bfd6816b417464c7..098195c8f0f2a61279e64baa6b5e55c58caea3dd 100644 (file)
--- a/helpers.c
+++ b/helpers.c
@@ -32,8 +32,8 @@ int __weak clock_gettime(clockid_t clk_id, struct timespec *ts)
 
        ret = gettimeofday(&tv, NULL);
 
-       ts->ts_sec = tv.tv_sec;
-       ts->ts_nsec = tv.tv_usec * 1000;
+       ts->tv_sec = tv.tv_sec;
+       ts->tv_nsec = tv.tv_usec * 1000;
 
        return ret;
 }

diff --git a/helpers.h b/helpers.h
index 61a3f2b2be1fd4edce64f0c603479418d11927b1..4f8cc0ce2f87bba511baebbfc13df02b52d92b13 100644 (file)
--- a/helpers.h
+++ b/helpers.h
@@ -1,6 +1,8 @@
 #ifndef FIO_HELPERS_H
 #define FIO_HELPERS_H
 
+#include "compiler/compiler.h"
+
 struct in_addr;
 
 extern int __weak posix_memalign(void **ptr, size_t align, size_t size);

diff --git a/mutex.c b/mutex.c
index a44743745ab43d18b8342a67598b4977c1e43557..e148430b618e5cae1c1fd93c1134f47910198ec6 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -11,6 +11,7 @@
 #include "mutex.h"
 #include "arch/arch.h"
 #include "os/os.h"
+#include "helpers.h"
 
 void fio_mutex_remove(struct fio_mutex *mutex)
 {

diff --git a/options.c b/options.c
index f62806289ebc3acdfb90b56bbcebb0fec7056309..1543eb95c160aa1afd2fae34c402dd3cab0092de 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1809,16 +1809,15 @@ static struct fio_keyword fio_keywords[] = {
 
 void fio_keywords_init(void)
 {
-       unsigned long mb_memory;
+       unsigned long long mb_memory;
        char buf[128];
        long l;
 
        sprintf(buf, "%lu", page_size);
        fio_keywords[0].replace = strdup(buf);
 
-       l = sysconf(_SC_PHYS_PAGES);
-       mb_memory = l * (page_size / 1024UL);
-       sprintf(buf, "%lu", mb_memory);
+       mb_memory = os_phys_mem() / page_size;
+       sprintf(buf, "%llu", mb_memory);
        fio_keywords[1].replace = strdup(buf);
 
        l = sysconf(_SC_NPROCESSORS_ONLN);

diff --git a/os/os.h b/os/os.h
index bed12814ffd26021590e5054e1b0be560b8e088d..a14c48578fc7774e998a0587525975dc1d28c3b8 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -111,8 +111,11 @@ static inline int os_cache_line_size(void)
 #ifdef FIO_USE_GENERIC_BDEV_SIZE
 static inline int blockdev_size(int fd, unsigned long long *bytes)
 {
-       off_t end = lseek(fd, 0, SEEK_END);
+       off_t end;
 
+       *bytes = 0;
+
+       end = lseek(fd, 0, SEEK_END);
        if (end < 0)
                return errno;