X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=os%2Fos-linux.h;h=dd9c5aaf493ce6ff403e5b1ec92c5390d7b82bb1;hp=7fa0c9566a6d4e24405b93563f3958b87dd639bb;hb=e8462bd8250cf3ff2d41f17e1a4d4cefc70b6b37;hpb=5e62c22a669c7a8c03b7871852cf85ad6d355980

diff --git a/os/os-linux.h b/os/os-linux.h
index 7fa0c956..dd9c5aaf 100644
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -6,10 +6,13 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 #include <linux/unistd.h>
 #include <linux/raw.h>
 #include <linux/major.h>
 
+#include "indirect.h"
+
 #define FIO_HAVE_LIBAIO
 #define FIO_HAVE_POSIXAIO
 #define FIO_HAVE_FADVISE
@@ -23,22 +26,61 @@
 #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 FIO_HAVE_PSHARED_MUTEX
+#define FIO_HAVE_CL_SIZE
+
+#define OS_MAP_ANON		MAP_ANONYMOUS
 
-#define OS_MAP_ANON		(MAP_ANONYMOUS)
+#ifndef CLOCK_MONOTONIC
+#define CLOCK_MONOTONIC 1
+#endif
 
 typedef cpu_set_t os_cpu_mask_t;
+
 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
 
-#define fio_setaffinity(td)		\
-	sched_setaffinity((td)->pid, sizeof((td)->o.cpumask), &(td)->o.cpumask)
+/*
+ * If you are on an ancient glibc (2.3.2), then define GLIBC_2_3_2 if you want
+ * the affinity helpers to work.
+ */
+#ifndef GLIBC_2_3_2
+#define fio_setaffinity(pid, cpumask)		\
+	sched_setaffinity((pid), sizeof(cpumask), &(cpumask))
 #define fio_getaffinity(pid, ptr)	\
 	sched_getaffinity((pid), sizeof(cpu_set_t), (ptr))
+#else
+#define fio_setaffinity(pid, cpumask)	\
+	sched_setaffinity((pid), &(cpumask))
+#define fio_getaffinity(pid, ptr)	\
+	sched_getaffinity((pid), (ptr))
+#endif
+
+#define fio_cpu_clear(mask, cpu)	CPU_CLR((cpu), (mask))
+#define fio_cpu_set(mask, cpu)		CPU_SET((cpu), (mask))
+
+static inline int fio_cpuset_init(os_cpu_mask_t *mask)
+{
+	CPU_ZERO(mask);
+	return 0;
+}
+
+static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
+{
+	return 0;
+}
+
+#define FIO_MAX_CPUS			CPU_SETSIZE
 
 static inline int ioprio_set(int which, int who, int ioprio)
 {
@@ -58,7 +100,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);
 }
@@ -88,7 +130,7 @@ struct async_head_user;
 static inline struct syslet_uatom *
 async_exec(struct syslet_uatom *atom, struct async_head_user *ahu)
 {
-	return (void *) syscall(__NR_async_exec, atom, ahu);
+	return (struct syslet_uatom *) syscall(__NR_async_exec, atom, ahu);
 }
 
 static inline long
@@ -172,14 +214,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;
@@ -210,4 +244,32 @@ static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
 	return 0;
 }
 
+#ifdef O_NOATIME
+#define FIO_O_NOATIME	O_NOATIME
+#else
+#define FIO_O_NOATIME	0
+#endif
+
+#define CACHE_LINE_FILE	\
+	"/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size"
+
+static inline int arch_cache_line_size(void)
+{
+	char size[32];
+	int fd, ret;
+
+	fd = open(CACHE_LINE_FILE, O_RDONLY);
+	if (fd < 0)
+		return -1;
+
+	ret = read(fd, size, sizeof(size));
+
+	close(fd);
+
+	if (ret <= 0)
+		return -1;
+	else
+		return atoi(size);
+}
+
 #endif