projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stat: Fix ioprio print
[fio.git]
/
os
/
os-linux.h
diff --git
a/os/os-linux.h
b/os/os-linux.h
index 84d1e33167e49e6bb2b8a50a7b8816ac7dcdfb7a..2f9f7e796dace80b8a609942e019858c60b91782 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>
@@
-18,6
+22,10
@@
#include <linux/fs.h>
#include <scsi/sg.h>
#include <asm/byteorder.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>
@@
-145,6
+153,9
@@
static inline int ioprio_set(int which, int who, int ioprio_class, int ioprio)
ioprio_value(ioprio_class, ioprio));
}
ioprio_value(ioprio_class, ioprio));
}
+#define ioprio_class(ioprio) ((ioprio) >> IOPRIO_CLASS_SHIFT)
+#define ioprio(ioprio) ((ioprio) & 7)
+
#ifndef CONFIG_HAVE_GETTID
static inline int gettid(void)
{
#ifndef CONFIG_HAVE_GETTID
static inline int gettid(void)
{
@@
-197,12
+208,6
@@
static inline unsigned long long os_phys_mem(void)
#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
@@
-243,14
+248,6
@@
static inline int arch_cache_line_size(void)
return atoi(size);
}
return atoi(size);
}
-#ifdef __powerpc64__
-#define FIO_HAVE_CPU_ONLINE_SYSCONF
-static inline unsigned int cpus_online(void)
-{
- return sysconf(_SC_NPROCESSORS_CONF);
-}
-#endif
-
static inline unsigned long long get_fs_free_size(const char *path)
{
unsigned long long ret;
static inline unsigned long long get_fs_free_size(const char *path)
{
unsigned long long ret;