Various fixes/updates

[fio.git] / os / os.h

diff --git a/os/os.h b/os/os.h
index e630627fddea38f4bfbb4608fe00af1f0f2142ea..92b6950d305d077261633723b181f35e273b33ae 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -1,12 +1,25 @@
 #ifndef FIO_OS_H
 #define FIO_OS_H
 
+#include <sys/types.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <stdlib.h>
+
 #if defined(__linux__)
 #include "os-linux.h"
 #elif defined(__FreeBSD__)
 #include "os-freebsd.h"
+#elif defined(__NetBSD__)
+#include "os-netbsd.h"
 #elif defined(__sun__)
 #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
@@ -24,17 +37,30 @@
 #include <scsi/sg.h>
 #endif
 
+#ifndef FIO_HAVE_STRSEP
+#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)
 #define POSIX_FADV_SEQUENTIAL  (0)
 #define POSIX_FADV_RANDOM      (0)
+#endif
 #endif /* FIO_HAVE_FADVISE */
 
 #ifndef FIO_HAVE_CPU_AFFINITY
-#define fio_setaffinity(td)            (0)
-#define fio_getaffinity(pid, mask)     (0)
+#define fio_setaffinity(pid, mask)     (0)
+#define fio_getaffinity(pid, mask)     do { } while (0)
+#define fio_cpu_clear(mask, cpu)       do { } while (0)
+#define fio_cpuset_exit(mask)          (-1)
+typedef unsigned long os_cpu_mask_t;
 #endif
 
 #ifndef FIO_HAVE_IOPRIO
@@ -49,15 +75,99 @@
 
 #ifndef FIO_HAVE_HUGETLB
 #define SHM_HUGETLB                    0
+#ifndef FIO_HUGE_PAGE
 #define FIO_HUGE_PAGE                  0
+#endif
 #else
 #ifndef FIO_HUGE_PAGE
 #define FIO_HUGE_PAGE                  4194304
 #endif
 #endif
 
+#ifndef FIO_O_NOATIME
+#define FIO_O_NOATIME                  0
+#endif
+
+#ifndef OS_RAND_MAX
+#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_HAVE_BLKTRACE
+static inline int is_blktrace(const char *fname)
+{
+       return 0;
+}
+struct thread_data;
+static inline int load_blktrace(struct thread_data *td, const char *fname)
+{
+       return 1;
+}
+#endif
+
+#define FIO_DEF_CL_SIZE                128
+
+static inline int os_cache_line_size(void)
+{
+#ifdef FIO_HAVE_CL_SIZE
+       int ret = arch_cache_line_size();
+
+       if (ret <= 0)
+               return FIO_DEF_CL_SIZE;
+
+       return ret;
+#else
+       return FIO_DEF_CL_SIZE;
+#endif
+}
+
+#ifdef FIO_USE_GENERIC_BDEV_SIZE
+static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
+{
+       off_t end;
+
+       *bytes = 0;
+
+       end = lseek(f->fd, 0, SEEK_END);
+       if (end < 0)
+               return errno;
+
+       *bytes = end;
+       return 0;
+}
+#endif
+
+#ifdef FIO_USE_GENERIC_RAND
+typedef unsigned int os_random_state_t;
+
+static inline void os_random_seed(unsigned long seed, os_random_state_t *rs)
+{
+       srand(seed);
+}
+
+static inline long os_random_long(os_random_state_t *rs)
+{
+       long val;
+
+       val = rand_r(rs);
+       return val;
+}
+#endif
+
+#ifndef FIO_HAVE_FS_STAT
+static inline unsigned long long get_fs_size(const char *path)
+{
+       return 0;
+}
+#endif
+
 #endif