Fix fd leak in cache line checking

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

diff --git a/os/os-linux.h b/os/os-linux.h
index 6812acd25cb56a14a0095818627113a77ec673fd..b766cbf9503af73a144e5cddf1f542ed8e13e3b4 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -6,6 +6,7 @@
 #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>
@@ -28,6 +29,8 @@
 #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
 
@@ -35,11 +38,8 @@
 #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;
 
 /*
@@ -67,6 +67,20 @@ typedef struct drand48_data os_random_state_t;
 #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)
 {
@@ -236,4 +250,26 @@ static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
 #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