X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos-linux.h;h=6f2372bcd7e48bc7074928a4afa0212202ebade3;hp=561b273db94e3dcd590e7e6dbfa24e39c497ba00;hb=5921e80c5dfc9f96d2f21da6ae58f2b5d3a0b373;hpb=317b95d07d4921d2594a1be6e014c9c2d062fe75;ds=sidebyside

diff --git a/os/os-linux.h b/os/os-linux.h
index 561b273d..6f2372bc 100644
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -10,6 +10,8 @@
 #include <linux/raw.h>
 #include <linux/major.h>
 
+#include "indirect.h"
+
 #define FIO_HAVE_LIBAIO
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_FADVISE
@@ -22,22 +24,47 @@
 #define FIO_HAVE_ODIRECT
 #define FIO_HAVE_HUGETLB
 #define FIO_HAVE_RAWBIND
+#define FIO_HAVE_BLKTRACE
+#define FIO_HAVE_STRSEP
 
 #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)
 #define fio_getaffinity(pid, ptr)	\
 	sched_getaffinity((pid), sizeof(cpu_set_t), (ptr))
+#else
+#define fio_setaffinity(td)		\
+	sched_setaffinity((td)->pid, &(td)->o.cpumask)
+#define fio_getaffinity(pid, ptr)	\
+	sched_getaffinity((pid), (ptr))
+#endif
+#endif
 
 static inline int ioprio_set(int which, int who, int ioprio)
 {
@@ -57,7 +84,7 @@ static inline int ioprio_set(int which, int who, int ioprio)
 #define SPLICE_F_GIFT   (0x08)  /* pages passed in are a gift */
 
 static inline int splice(int fdin, loff_t *off_in, int fdout, loff_t *off_out,
-			 size_t len, unsigned long flags)
+			 size_t len, unsigned int flags)
 {
 	return syscall(__NR_sys_splice, fdin, off_in, fdout, off_out, len, flags);
 }
@@ -109,12 +136,20 @@ static inline long umem_add(unsigned long *uptr, unsigned long inc)
 }
 #endif /* FIO_HAVE_SYSLET */
 
+enum {
+	IOPRIO_CLASS_NONE,
+	IOPRIO_CLASS_RT,
+	IOPRIO_CLASS_BE,
+	IOPRIO_CLASS_IDLE,
+};
+
 enum {
 	IOPRIO_WHO_PROCESS = 1,
 	IOPRIO_WHO_PGRP,
 	IOPRIO_WHO_USER,
 };
 
+#define IOPRIO_BITS		16
 #define IOPRIO_CLASS_SHIFT	13
 
 #ifndef BLKGETSIZE64
@@ -163,21 +198,13 @@ 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 void fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
+static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
 {
 	struct raw_config_request rq;
 	int fd;
 
 	if (major(dev) != RAW_MAJOR)
-		return;
+		return 1;
 
 	/*
 	 * we should be able to find /dev/rawctl or /dev/raw/rawctl
@@ -186,18 +213,21 @@ static inline void fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
 	if (fd < 0) {
 		fd = open("/dev/raw/rawctl", O_RDONLY);
 		if (fd < 0)
-			return;
+			return 1;
 	}
 
 	rq.raw_minor = minor(dev);
 	if (ioctl(fd, RAW_GETBIND, &rq) < 0) {
 		close(fd);
-		return;
+		return 1;
 	}
 
 	close(fd);
 	*majdev = rq.block_major;
 	*mindev = rq.block_minor;
+	return 0;
 }
 
+#define FIO_O_NOATIME	O_NOATIME
+
 #endif