Fixup bad logging types

[fio.git] / os / os.h

diff --git a/os/os.h b/os/os.h
index d6ce9a778acf518b6811d13e88b093204b292a9d..4416ae482fb46a176cccf252bea8307dbc24b0c8 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -3,10 +3,13 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <fcntl.h>
 #include <pthread.h>
 #include <unistd.h>
 #include <stdlib.h>
 
+#include "../arch/arch.h"
+
 enum {
        os_linux = 1,
        os_aix,
@@ -16,11 +19,14 @@ enum {
        os_netbsd,
        os_solaris,
        os_windows,
+       os_android,
 
        os_nr,
 };
 
-#if defined(__linux__)
+#if defined(__ANDROID__)
+#include "os-android.h"
+#elif defined(__linux__)
 #include "os-linux.h"
 #elif defined(__FreeBSD__)
 #include "os-freebsd.h"
@@ -34,17 +40,13 @@ enum {
 #include "os-aix.h"
 #elif defined(__hpux)
 #include "os-hpux.h"
-#elif defined(__CYGWIN__)
+#elif defined(WIN32)
 #include "os-windows.h"
 #else
 #error "unsupported os"
 #endif
 
-#ifdef FIO_HAVE_LIBAIO
-#include <libaio.h>
-#endif
-
-#ifdef FIO_HAVE_POSIXAIO
+#ifdef CONFIG_POSIXAIO
 #include <aio.h>
 #ifndef FIO_OS_HAVE_AIOCB_TYPEDEF
 typedef struct aiocb os_aiocb_t;
@@ -56,7 +58,7 @@ typedef struct aiocb os_aiocb_t;
 #include <scsi/sg.h>
 #endif
 
-#ifndef FIO_HAVE_STRSEP
+#ifndef CONFIG_STRSEP
 #include "../lib/strsep.h"
 #endif
 
@@ -64,15 +66,11 @@ typedef struct aiocb os_aiocb_t;
 #define OS_MSG_DONTWAIT        MSG_DONTWAIT
 #endif
 
-#ifndef FIO_HAVE_FADVISE
-#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(pid, mask)     (0)
@@ -83,7 +81,7 @@ typedef unsigned long os_cpu_mask_t;
 #endif
 
 #ifndef FIO_HAVE_IOPRIO
-#define ioprio_set(which, who, prio)   (0)
+#define ioprio_set(which, who, prioclass, prio)        (0)
 #endif
 
 #ifndef FIO_HAVE_ODIRECT
@@ -94,6 +92,7 @@ typedef unsigned long os_cpu_mask_t;
 
 #ifndef FIO_HAVE_HUGETLB
 #define SHM_HUGETLB                    0
+#define MAP_HUGETLB                    0
 #ifndef FIO_HUGE_PAGE
 #define FIO_HUGE_PAGE                  0
 #endif
@@ -103,6 +102,10 @@ typedef unsigned long os_cpu_mask_t;
 #endif
 #endif
 
+#ifndef FIO_HAVE_MMAP_HUGE
+#define MAP_HUGETLB                    0
+#endif
+
 #ifndef FIO_O_NOATIME
 #define FIO_O_NOATIME                  0
 #endif
@@ -111,12 +114,6 @@ 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
@@ -125,12 +122,28 @@ typedef unsigned long os_cpu_mask_t;
 #define FIO_PREFERRED_ENGINE   "sync"
 #endif
 
+#ifndef FIO_OS_PATH_SEPARATOR
+#define FIO_OS_PATH_SEPARATOR  "/"
+#endif
+
+#ifndef FIO_PREFERRED_CLOCK_SOURCE
+#ifdef CONFIG_CLOCK_GETTIME
+#define FIO_PREFERRED_CLOCK_SOURCE     CS_CGETTIME
+#else
+#define FIO_PREFERRED_CLOCK_SOURCE     CS_GTOD
+#endif
+#endif
+
 #ifndef FIO_MAX_JOBS
 #define FIO_MAX_JOBS           2048
 #endif
 
-#ifndef FIO_OS_HAVE_SOCKLEN_T
-typedef socklen_t fio_socklen_t;
+#ifndef CONFIG_SOCKLEN_T
+typedef unsigned int socklen_t;
+#endif
+
+#ifndef FIO_OS_HAS_CTIME_R
+#define os_ctime_r(x, y, z)     (void) ctime_r((x), (y))
 #endif
 
 #ifdef FIO_USE_GENERIC_SWAP
@@ -157,7 +170,8 @@ static inline uint64_t fio_swap64(uint64_t val)
 }
 #endif
 
-#ifdef FIO_LITTLE_ENDIAN
+#ifndef FIO_HAVE_BYTEORDER_FUNCS
+#ifdef CONFIG_LITTLE_ENDIAN
 #define __le16_to_cpu(x)               (x)
 #define __le32_to_cpu(x)               (x)
 #define __le64_to_cpu(x)               (x)
@@ -172,6 +186,7 @@ static inline uint64_t fio_swap64(uint64_t val)
 #define __cpu_to_le32(x)               fio_swap32(x)
 #define __cpu_to_le64(x)               fio_swap64(x)
 #endif
+#endif /* FIO_HAVE_BYTEORDER_FUNCS */
 
 #define le16_to_cpu(val) ({                    \
        uint16_t *__val = &(val);               \
@@ -259,6 +274,32 @@ static inline long os_random_long(os_random_state_t *rs)
 }
 #endif
 
+#ifdef FIO_USE_GENERIC_INIT_RANDOM_STATE
+extern void td_fill_rand_seeds(struct thread_data *td);
+/*
+ * Initialize the various random states we need (random io, block size ranges,
+ * read/write mix, etc).
+ */
+static inline int init_random_state(struct thread_data *td, unsigned long *rand_seeds, int size)
+{
+       int fd;
+
+       fd = open("/dev/urandom", O_RDONLY);
+       if (fd == -1) {
+               return 1;
+       }
+
+       if (read(fd, rand_seeds, size) < size) {
+               close(fd);
+               return 1;
+       }
+
+       close(fd);
+       td_fill_rand_seeds(td);
+       return 0;
+}
+#endif
+
 #ifndef FIO_HAVE_FS_STAT
 static inline unsigned long long get_fs_size(const char *path)
 {