projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge os-android.h into os-linux.h
[fio.git]
/
os
/
os-linux.h
diff --git
a/os/os-linux.h
b/os/os-linux.h
index 3001140ca486630d6bb60a2958c01d824fbd7fc8..831f0ad0474d5c61c47990371575170472fe56c7 100644
(file)
--- a/
os/os-linux.h
+++ b/
os/os-linux.h
@@
-1,7
+1,11
@@
#ifndef FIO_OS_LINUX_H
#define FIO_OS_LINUX_H
#ifndef FIO_OS_LINUX_H
#define FIO_OS_LINUX_H
+#ifdef __ANDROID__
+#define FIO_OS os_android
+#else
#define FIO_OS os_linux
#define FIO_OS os_linux
+#endif
#include <sys/ioctl.h>
#include <sys/uio.h>
#include <sys/ioctl.h>
#include <sys/uio.h>
@@
-17,6
+21,11
@@
#include <linux/major.h>
#include <linux/fs.h>
#include <scsi/sg.h>
#include <linux/major.h>
#include <linux/fs.h>
#include <scsi/sg.h>
+#include <asm/byteorder.h>
+#ifdef __ANDROID__
+#include "os-ashmem.h"
+#define FIO_NO_HAVE_SHM_H
+#endif
#ifdef ARCH_HAVE_CRC_CRYPTO
#include <sys/auxv.h>
#ifdef ARCH_HAVE_CRC_CRYPTO
#include <sys/auxv.h>
@@
-50,6
+59,7
@@
#define FIO_HAVE_TRIM
#define FIO_HAVE_GETTID
#define FIO_USE_GENERIC_INIT_RANDOM_STATE
#define FIO_HAVE_TRIM
#define FIO_HAVE_GETTID
#define FIO_USE_GENERIC_INIT_RANDOM_STATE
+#define FIO_HAVE_BYTEORDER_FUNCS
#define FIO_HAVE_PWRITEV2
#define FIO_HAVE_SHM_ATTACH_REMOVED
#define FIO_HAVE_PWRITEV2
#define FIO_HAVE_SHM_ATTACH_REMOVED
@@
-81,8
+91,8
@@
typedef cpu_set_t os_cpu_mask_t;
pthread_getaffinity_np(pthread_self(), sizeof(mask), &(mask))
#endif
pthread_getaffinity_np(pthread_self(), sizeof(mask), &(mask))
#endif
-#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) CPU_CLR((cpu), (mask))
+#define fio_cpu_set(mask, cpu) CPU_SET((cpu), (mask))
#define fio_cpu_isset(mask, cpu) (CPU_ISSET((cpu), (mask)) != 0)
#define fio_cpu_count(mask) CPU_COUNT((mask))
#define fio_cpu_isset(mask, cpu) (CPU_ISSET((cpu), (mask)) != 0)
#define fio_cpu_count(mask) CPU_COUNT((mask))