Merge branch 'master' of ssh://router/data/git/fio

[fio.git] / os / os.h

diff --git a/os/os.h b/os/os.h
index b1ed1bb6953dfc563904a7f4f13496a0c669b87a..dbf095711c08344e054966512dae3f41d8c75280 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -25,7 +25,7 @@
 #endif
 
 #ifndef FIO_HAVE_STRSEP
-#include "../lib/lib.h"
+#include "../lib/strsep.h"
 #endif
 
 #ifndef FIO_HAVE_FADVISE
@@ -40,7 +40,9 @@
 
 #ifndef FIO_HAVE_CPU_AFFINITY
 #define fio_setaffinity(td)            (0)
-#define fio_getaffinity(pid, mask)     do { } while(0)
+#define fio_getaffinity(pid, mask)     do { } while (0)
+#define fio_cpu_clear(mask, cpu)       do { } while (0)
+#define fio_cpuset_exit(mask)          (-1)
 #endif
 
 #ifndef FIO_HAVE_IOPRIO
@@ -68,6 +70,10 @@
 #define FIO_O_NOATIME                  0
 #endif
 
+#ifndef OS_RAND_MAX
+#define OS_RAND_MAX                    RAND_MAX
+#endif
+
 #ifndef FIO_HAVE_RAWBIND
 #define fio_lookup_raw(dev, majdev, mindev)    1
 #endif
@@ -84,4 +90,20 @@ static inline int load_blktrace(struct thread_data *td, const char *fname)
 }
 #endif
 
+#define FIO_DEF_CL_SIZE                128
+
+static inline int os_cache_line_size(void)
+{
+#ifdef FIO_HAVE_CL_SIZE
+       int ret = arch_cache_line_size();
+
+       if (ret <= 0)
+               return FIO_DEF_CL_SIZE;
+
+       return ret;
+#else
+       return FIO_DEF_CL_SIZE;
+#endif
+}
+
 #endif