X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=os%2Fos-mac.h;h=d202e99dd60a93bc3c11dd0088456bbc1a731adf;hb=da52c582b76a8752ad3dd113696c9debcb3449e8;hp=80c49f474e007ea461bd22eb30d16d5b646125de;hpb=cca84643cc10cd72b0b453ff92ccb8643ba51493;p=fio.git

diff --git a/os/os-mac.h b/os/os-mac.h
index 80c49f47..d202e99d 100644
--- a/os/os-mac.h
+++ b/os/os-mac.h
@@ -16,30 +16,13 @@
 
 #include "../file.h"
 
-#ifndef CLOCK_MONOTONIC
-#define CLOCK_MONOTONIC 1
-#endif
-
-#ifndef CLOCK_REALTIME
-#define CLOCK_REALTIME 1
-#endif
-
-#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
 
 #define OS_MAP_ANON		MAP_ANON
 
-#if defined(__LITTLE_ENDIAN__)
-#define FIO_LITTLE_ENDIAN
-#elif defined(__BIG_ENDIAN__)
-#define FIO_BIG_ENDIAN
-#else
-#error "Undefined byte order"
-#endif
-
 #define fio_swap16(x)	OSSwapInt16(x)
 #define fio_swap32(x)	OSSwapInt32(x)
 #define fio_swap64(x)	OSSwapInt64(x)
@@ -69,17 +52,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 +68,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 +116,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)
@@ -184,4 +161,11 @@ static inline int gettid(void)
 {
 	return mach_thread_self();
 }
+
+/*
+ * For some reason, there's no header definition for fdatasync(), even
+ * if it exists.
+ */
+extern int fdatasync(int fd);
+
 #endif