Fio 2.2.13

[fio.git] / os / os-linux.h

diff --git a/os/os-linux.h b/os/os-linux.h
index d7eec0f2fd7d1bece339f9b61e723523755545ff..9e708f04c7b020f466decf189909ff3e9df2d6c6 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -15,7 +15,7 @@
 #include <linux/unistd.h>
 #include <linux/raw.h>
 #include <linux/major.h>
-#include <endian.h>
+#include <byteswap.h>
 
 #include "binject.h"
 #include "../file.h"
@@ -62,6 +62,8 @@ typedef struct drand48_data os_random_state_t;
 
 #define fio_cpu_clear(mask, cpu)       (void) CPU_CLR((cpu), (mask))
 #define fio_cpu_set(mask, cpu)         (void) CPU_SET((cpu), (mask))
+#define fio_cpu_isset(mask, cpu)       CPU_ISSET((cpu), (mask))
+#define fio_cpu_count(mask)            CPU_COUNT((mask))
 
 static inline int fio_cpuset_init(os_cpu_mask_t *mask)
 {
@@ -76,18 +78,6 @@ static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
 
 #define FIO_MAX_CPUS                   CPU_SETSIZE
 
-static inline int ioprio_set(int which, int who, int ioprio)
-{
-       return syscall(__NR_ioprio_set, which, who, ioprio);
-}
-
-static inline int gettid(void)
-{
-       return syscall(__NR_gettid);
-}
-
-#define SPLICE_DEF_SIZE        (64*1024)
-
 enum {
        IOPRIO_CLASS_NONE,
        IOPRIO_CLASS_RT,
@@ -104,6 +94,25 @@ enum {
 #define IOPRIO_BITS            16
 #define IOPRIO_CLASS_SHIFT     13
 
+static inline int ioprio_set(int which, int who, int ioprio_class, int ioprio)
+{
+       /*
+        * If no class is set, assume BE
+        */
+       if (!ioprio_class)
+               ioprio_class = IOPRIO_CLASS_BE;
+
+       ioprio |= ioprio_class << IOPRIO_CLASS_SHIFT;
+       return syscall(__NR_ioprio_set, which, who, ioprio);
+}
+
+static inline int gettid(void)
+{
+       return syscall(__NR_gettid);
+}
+
+#define SPLICE_DEF_SIZE        (64*1024)
+
 #ifndef BLKGETSIZE64
 #define BLKGETSIZE64   _IOR(0x12,114,size_t)
 #endif
@@ -190,21 +199,31 @@ static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
 #define FIO_O_NOATIME  0
 #endif
 
+#ifdef O_ATOMIC
+#define OS_O_ATOMIC    O_ATOMIC
+#else
+#define OS_O_ATOMIC    040000000
+#endif
+
 #ifdef MADV_REMOVE
 #define FIO_MADV_FREE  MADV_REMOVE
 #endif
 
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define FIO_LITTLE_ENDIAN
-#elif __BYTE_ORDER == __BIG_ENDIAN
-#define FIO_BIG_ENDIAN
+#if defined(__builtin_bswap16)
+#define fio_swap16(x)  __builtin_bswap16(x)
 #else
-#error "Unknown endianness"
-#endif
-
 #define fio_swap16(x)  __bswap_16(x)
+#endif
+#if defined(__builtin_bswap32)
+#define fio_swap32(x)  __builtin_bswap32(x)
+#else
 #define fio_swap32(x)  __bswap_32(x)
+#endif
+#if defined(__builtin_bswap64)
+#define fio_swap64(x)  __builtin_bswap64(x)
+#else
 #define fio_swap64(x)  __bswap_64(x)
+#endif
 
 #define CACHE_LINE_FILE        \
        "/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size"
@@ -228,7 +247,7 @@ static inline int arch_cache_line_size(void)
                return atoi(size);
 }
 
-static inline unsigned long long get_fs_size(const char *path)
+static inline unsigned long long get_fs_free_size(const char *path)
 {
        unsigned long long ret;
        struct statfs s;
@@ -255,4 +274,18 @@ static inline int os_trim(int fd, unsigned long long start,
        return errno;
 }
 
+#ifdef CONFIG_SCHED_IDLE
+static inline int fio_set_sched_idle(void)
+{
+       struct sched_param p = { .sched_priority = 0, };
+       return sched_setscheduler(gettid(), SCHED_IDLE, &p);
+}
+#endif
+
+#ifndef POSIX_FADV_STREAMID
+#define POSIX_FADV_STREAMID    8
+#endif
+
+#define FIO_HAVE_STREAMID
+
 #endif