X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos-linux.h;h=a07db06b2a04c898af2d8320add4a56a8405e5df;hp=f4b6a22361bfa1b5d6f04ece4d6f53c882755f50;hb=207cb0f05e689a50ffb960830f52169a1342aba7;hpb=495ee9b632c5629e79a46d1074cacf4eda965e13 diff --git a/os/os-linux.h b/os/os-linux.h index f4b6a223..a07db06b 100644 --- a/os/os-linux.h +++ b/os/os-linux.h @@ -10,6 +10,8 @@ #include #include +#include "indirect.h" + #define FIO_HAVE_LIBAIO #define FIO_HAVE_POSIXAIO #define FIO_HAVE_FADVISE @@ -23,22 +25,36 @@ #define FIO_HAVE_HUGETLB #define FIO_HAVE_RAWBIND #define FIO_HAVE_BLKTRACE +#define FIO_HAVE_STRSEP +#define FIO_HAVE_FALLOCATE +#define FIO_HAVE_POSIXAIO_FSYNC #define OS_MAP_ANON (MAP_ANONYMOUS) +#ifndef CLOCK_MONOTONIC +#define CLOCK_MONOTONIC 1 +#endif + +#ifdef FIO_HAVE_CPU_AFFINITY typedef cpu_set_t os_cpu_mask_t; +#else +typedef int os_cpu_mask_t; +#endif typedef struct drand48_data os_random_state_t; /* * we want fadvise64 really, but it's so tangled... later */ +#ifdef FIO_HAVE_FADVISE #define fadvise(fd, off, len, advice) \ posix_fadvise((fd), (off_t)(off), (len), (advice)) +#endif /* * If you are on an ancient glibc (2.3.2), then define GLIBC_2_3_2 if you want * the affinity helpers to work. */ +#ifdef FIO_HAVE_CPU_AFFINITY #ifndef GLIBC_2_3_2 #define fio_setaffinity(td) \ sched_setaffinity((td)->pid, sizeof((td)->o.cpumask), &(td)->o.cpumask) @@ -50,6 +66,7 @@ typedef struct drand48_data os_random_state_t; #define fio_getaffinity(pid, ptr) \ sched_getaffinity((pid), (ptr)) #endif +#endif static inline int ioprio_set(int which, int who, int ioprio) { @@ -183,14 +200,6 @@ static inline long os_random_long(os_random_state_t *rs) return val; } -static inline double os_random_double(os_random_state_t *rs) -{ - double val; - - drand48_r(rs, &val); - return val; -} - static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev) { struct raw_config_request rq; @@ -221,4 +230,6 @@ static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev) return 0; } +#define FIO_O_NOATIME O_NOATIME + #endif