projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'libpmemblk' of https://github.com/bgbhpe/fio
[fio.git]
/
os
/
os-linux.h
diff --git
a/os/os-linux.h
b/os/os-linux.h
index 869a25d8ee5d86c684762d91c4f7a4496f2b5d7f..23c16b65b79c8a6bfcae13a2ebbbb0481b61a5cd 100644
(file)
--- a/
os/os-linux.h
+++ b/
os/os-linux.h
@@
-6,6
+6,7
@@
#include <sys/ioctl.h>
#include <sys/uio.h>
#include <sys/syscall.h>
#include <sys/ioctl.h>
#include <sys/uio.h>
#include <sys/syscall.h>
+#include <sys/sysmacros.h>
#include <sys/vfs.h>
#include <sys/mman.h>
#include <unistd.h>
#include <sys/vfs.h>
#include <sys/mman.h>
#include <unistd.h>
@@
-15,6
+16,7
@@
#include <linux/unistd.h>
#include <linux/raw.h>
#include <linux/major.h>
#include <linux/unistd.h>
#include <linux/raw.h>
#include <linux/major.h>
+#include <byteswap.h>
#include "binject.h"
#include "../file.h"
#include "binject.h"
#include "../file.h"
@@
-61,6
+63,8
@@
typedef struct drand48_data os_random_state_t;
#define fio_cpu_clear(mask, cpu) (void) CPU_CLR((cpu), (mask))
#define fio_cpu_set(mask, cpu) (void) CPU_SET((cpu), (mask))
#define fio_cpu_clear(mask, cpu) (void) CPU_CLR((cpu), (mask))
#define fio_cpu_set(mask, cpu) (void) CPU_SET((cpu), (mask))
+#define fio_cpu_isset(mask, cpu) CPU_ISSET((cpu), (mask))
+#define fio_cpu_count(mask) CPU_COUNT((mask))
static inline int fio_cpuset_init(os_cpu_mask_t *mask)
{
static inline int fio_cpuset_init(os_cpu_mask_t *mask)
{
@@
-196,13
+200,31
@@
static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
#define FIO_O_NOATIME 0
#endif
#define FIO_O_NOATIME 0
#endif
+#ifdef O_ATOMIC
+#define OS_O_ATOMIC O_ATOMIC
+#else
+#define OS_O_ATOMIC 040000000
+#endif
+
#ifdef MADV_REMOVE
#define FIO_MADV_FREE MADV_REMOVE
#endif
#ifdef MADV_REMOVE
#define FIO_MADV_FREE MADV_REMOVE
#endif
+#if defined(__builtin_bswap16)
+#define fio_swap16(x) __builtin_bswap16(x)
+#else
#define fio_swap16(x) __bswap_16(x)
#define fio_swap16(x) __bswap_16(x)
+#endif
+#if defined(__builtin_bswap32)
+#define fio_swap32(x) __builtin_bswap32(x)
+#else
#define fio_swap32(x) __bswap_32(x)
#define fio_swap32(x) __bswap_32(x)
+#endif
+#if defined(__builtin_bswap64)
+#define fio_swap64(x) __builtin_bswap64(x)
+#else
#define fio_swap64(x) __bswap_64(x)
#define fio_swap64(x) __bswap_64(x)
+#endif
#define CACHE_LINE_FILE \
"/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size"
#define CACHE_LINE_FILE \
"/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size"
@@
-226,7
+248,7
@@
static inline int arch_cache_line_size(void)
return atoi(size);
}
return atoi(size);
}
-static inline unsigned long long get_fs_size(const char *path)
+static inline unsigned long long get_fs_
free_
size(const char *path)
{
unsigned long long ret;
struct statfs s;
{
unsigned long long ret;
struct statfs s;
@@
-261,4
+283,10
@@
static inline int fio_set_sched_idle(void)
}
#endif
}
#endif
+#ifndef POSIX_FADV_STREAMID
+#define POSIX_FADV_STREAMID 8
+#endif
+
+#define FIO_HAVE_STREAMID
+
#endif
#endif