Merge branch 'patch-1' of https://github.com/avlasov-mos-de/fio

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

diff --git a/os/os-linux.h b/os/os-linux.h
index 6b63d123956afa6f28f20b3e7ff32e583f652e99..65d3b429a87f408786c5569bf2c3884e9ea4474c 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -58,9 +58,9 @@
 
 #define OS_MAP_ANON            MAP_ANONYMOUS
 
-typedef cpu_set_t os_cpu_mask_t;
+#define FIO_EXT_ENG_DIR        "/usr/lib/fio"
 
-typedef struct drand48_data os_random_state_t;
+typedef cpu_set_t os_cpu_mask_t;
 
 #ifdef CONFIG_3ARG_AFFINITY
 #define fio_setaffinity(pid, cpumask)          \
@@ -126,10 +126,12 @@ static inline int ioprio_set(int which, int who, int ioprio_class, int ioprio)
        return syscall(__NR_ioprio_set, which, who, ioprio);
 }
 
+#ifndef CONFIG_HAVE_GETTID
 static inline int gettid(void)
 {
        return syscall(__NR_gettid);
 }
+#endif
 
 #define SPLICE_DEF_SIZE        (64*1024)
 
@@ -170,19 +172,6 @@ static inline unsigned long long os_phys_mem(void)
        return (unsigned long long) pages * (unsigned long long) pagesize;
 }
 
-static inline void os_random_seed(unsigned long seed, os_random_state_t *rs)
-{
-       srand48_r(seed, rs);
-}
-
-static inline long os_random_long(os_random_state_t *rs)
-{
-       long val;
-
-       lrand48_r(rs, &val);
-       return val;
-}
-
 static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
 {
        struct raw_config_request rq;
@@ -338,6 +327,13 @@ static inline int fio_set_sched_idle(void)
 #ifndef RWF_SYNC
 #define RWF_SYNC       0x00000004
 #endif
+#ifndef RWF_NOWAIT
+#define RWF_NOWAIT     0x00000008
+#endif
+
+#ifndef RWF_UNCACHED
+#define RWF_UNCACHED   0x00000040
+#endif
 
 #ifndef RWF_WRITE_LIFE_SHIFT
 #define RWF_WRITE_LIFE_SHIFT           4