projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move file service type defines to file.h
[fio.git]
/
os
/
os.h
diff --git
a/os/os.h
b/os/os.h
index 42cd63d020aedf28e91114ef171697e4f393b6e1..dbf095711c08344e054966512dae3f41d8c75280 100644
(file)
--- a/
os/os.h
+++ b/
os/os.h
@@
-24,6
+24,10
@@
#include <scsi/sg.h>
#endif
#include <scsi/sg.h>
#endif
+#ifndef FIO_HAVE_STRSEP
+#include "../lib/strsep.h"
+#endif
+
#ifndef FIO_HAVE_FADVISE
#define fadvise(fd, off, len, advice) (0)
#ifndef FIO_HAVE_FADVISE
#define fadvise(fd, off, len, advice) (0)
@@
-36,7
+40,9
@@
#ifndef FIO_HAVE_CPU_AFFINITY
#define fio_setaffinity(td) (0)
#ifndef FIO_HAVE_CPU_AFFINITY
#define fio_setaffinity(td) (0)
-#define fio_getaffinity(pid, mask) (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
#endif
#ifndef FIO_HAVE_IOPRIO
@@
-60,6
+66,14
@@
#endif
#endif
#endif
#endif
+#ifndef FIO_O_NOATIME
+#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
#ifndef FIO_HAVE_RAWBIND
#define fio_lookup_raw(dev, majdev, mindev) 1
#endif
@@
-69,10
+83,27
@@
static inline int is_blktrace(const char *fname)
{
return 0;
}
{
return 0;
}
+struct thread_data;
static inline int load_blktrace(struct thread_data *td, const char *fname)
{
return 1;
}
#endif
static inline int load_blktrace(struct thread_data *td, const char *fname)
{
return 1;
}
#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
#endif