X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos.h;h=4bbdd623a987c174122b2577b2899332605a0a0c;hp=218766ab1fee160a252dc3bc14a8c5ee69705c79;hb=fca7035863bd570270376a0c06776e5549ff813e;hpb=2e3bd4c21cc239fbda992a4ede89ebb85f550920

diff --git a/os/os.h b/os/os.h
index 218766ab..4bbdd623 100644
--- a/os/os.h
+++ b/os/os.h
@@ -2,7 +2,9 @@
 #define FIO_OS_H
 
 #include <sys/types.h>
+#include <pthread.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 #if defined(__linux__)
 #include "os-linux.h"
@@ -14,6 +16,10 @@
 #include "os-solaris.h"
 #elif defined(__APPLE__)
 #include "os-mac.h"
+#elif defined(_AIX)
+#include "os-aix.h"
+#elif defined(__CYGWIN__)
+#include "os-windows.h"
 #else
 #error "unsupported os"
 #endif
@@ -35,8 +41,12 @@
 #include "../lib/strsep.h"
 #endif
 
+#ifdef MSG_DONTWAIT
+#define OS_MSG_DONTWAIT	MSG_DONTWAIT
+#endif
+
 #ifndef FIO_HAVE_FADVISE
-#define fadvise(fd, off, len, advice)	(0)
+#define posix_fadvise(fd, off, len, advice)	(0)
 
 #ifndef POSIX_FADV_DONTNEED
 #define POSIX_FADV_DONTNEED	(0)
@@ -82,10 +92,24 @@ typedef unsigned long os_cpu_mask_t;
 #define OS_RAND_MAX			RAND_MAX
 #endif
 
+#ifdef FIO_HAVE_CLOCK_MONOTONIC
+#define FIO_TIMER_CLOCK CLOCK_MONOTONIC
+#else
+#define FIO_TIMER_CLOCK CLOCK_REALTIME
+#endif
+
 #ifndef FIO_HAVE_RAWBIND
 #define fio_lookup_raw(dev, majdev, mindev)	1
 #endif
 
+#ifndef FIO_PREFERRED_ENGINE
+#define FIO_PREFERRED_ENGINE	"sync"
+#endif
+
+#ifndef FIO_MAX_JOBS
+#define FIO_MAX_JOBS		2048
+#endif
+
 #ifndef FIO_HAVE_BLKTRACE
 static inline int is_blktrace(const char *fname)
 {
@@ -115,13 +139,13 @@ 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)
+static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
 {
 	off_t end;
 
 	*bytes = 0;
 
-	end = lseek(fd, 0, SEEK_END);
+	end = lseek(f->fd, 0, SEEK_END);
 	if (end < 0)
 		return errno;