projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix splice engine compile
[fio.git]
/
os
/
os-linux.h
diff --git
a/os/os-linux.h
b/os/os-linux.h
index f4b6a22361bfa1b5d6f04ece4d6f53c882755f50..dd783be3a61e63ee5955ffa121a5831c2413fe07 100644
(file)
--- a/
os/os-linux.h
+++ b/
os/os-linux.h
@@
-26,19
+26,30
@@
#define OS_MAP_ANON (MAP_ANONYMOUS)
#define OS_MAP_ANON (MAP_ANONYMOUS)
+#ifndef CLOCK_MONOTONIC
+#define CLOCK_MONOTONIC 1
+#endif
+
+#ifdef FIO_HAVE_CPU_AFFINITY
typedef cpu_set_t os_cpu_mask_t;
typedef cpu_set_t os_cpu_mask_t;
+#else
+typedef int os_cpu_mask_t;
+#endif
typedef struct drand48_data os_random_state_t;
/*
* we want fadvise64 really, but it's so tangled... later
*/
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))
#define fadvise(fd, off, len, advice) \
posix_fadvise((fd), (off_t)(off), (len), (advice))
+#endif
/*
* If you are on an ancient glibc (2.3.2), then define GLIBC_2_3_2 if you want
* the affinity helpers to work.
*/
/*
* If you are on an ancient glibc (2.3.2), then define GLIBC_2_3_2 if you want
* the affinity helpers to work.
*/
+#ifdef FIO_HAVE_CPU_AFFINITY
#ifndef GLIBC_2_3_2
#define fio_setaffinity(td) \
sched_setaffinity((td)->pid, sizeof((td)->o.cpumask), &(td)->o.cpumask)
#ifndef GLIBC_2_3_2
#define fio_setaffinity(td) \
sched_setaffinity((td)->pid, sizeof((td)->o.cpumask), &(td)->o.cpumask)
@@
-50,6
+61,7
@@
typedef struct drand48_data os_random_state_t;
#define fio_getaffinity(pid, ptr) \
sched_getaffinity((pid), (ptr))
#endif
#define fio_getaffinity(pid, ptr) \
sched_getaffinity((pid), (ptr))
#endif
+#endif
static inline int ioprio_set(int which, int who, int ioprio)
{
static inline int ioprio_set(int which, int who, int ioprio)
{
@@
-86,6
+98,10
@@
static inline int vmsplice(int fd, const struct iovec *iov,
}
#endif
}
#endif
+#ifndef SPLICE_F_UNMAP
+#define SPLICE_F_UNMAP (0x10)
+#endif
+
#define SPLICE_DEF_SIZE (64*1024)
#ifdef FIO_HAVE_SYSLET
#define SPLICE_DEF_SIZE (64*1024)
#ifdef FIO_HAVE_SYSLET
@@
-183,14
+199,6
@@
static inline long os_random_long(os_random_state_t *rs)
return val;
}
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;
static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
{
struct raw_config_request rq;