Add strong madvise() hint for cache pruning

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

diff --git a/os/os-linux.h b/os/os-linux.h
index 1cd8272d5241750c67107536b2a0a1268236e7c0..e4c4c3fd2f094eceaad485f1d53b2d35def66367 100644 (file)
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -55,13 +55,13 @@ typedef struct drand48_data os_random_state_t;
  * the affinity helpers to work.
  */
 #ifndef GLIBC_2_3_2
-#define fio_setaffinity(td)            \
-       sched_setaffinity((td)->pid, sizeof((td)->o.cpumask), &(td)->o.cpumask)
+#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(td)            \
-       sched_setaffinity((td)->pid, &(td)->o.cpumask)
+#define fio_setaffinity(pid, cpumask)  \
+       sched_setaffinity((pid), &(cpumask))
 #define fio_getaffinity(pid, ptr)      \
        sched_getaffinity((pid), (ptr))
 #endif
@@ -250,6 +250,10 @@ static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
 #define FIO_O_NOATIME  0
 #endif
 
+#ifdef MADV_REMOVE
+#define FIO_MADV_FREE  MADV_REMOVE
+#endif
+
 #define CACHE_LINE_FILE        \
        "/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size"
 
@@ -263,10 +267,13 @@ static inline int arch_cache_line_size(void)
                return -1;
 
        ret = read(fd, size, sizeof(size));
+
+       close(fd);
+
        if (ret <= 0)
                return -1;
-
-       return atoi(size);
+       else
+               return atoi(size);
 }
 
 #endif