projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'asmfix' of https://github.com/oohal/fio
[fio.git]
/
os
/
os-android.h
diff --git
a/os/os-android.h
b/os/os-android.h
index f371116f8f6a9a45a37372b3044f71c77f88f368..bb590e4786fe3f713ed7e1a1914963ecc9dc1276 100644
(file)
--- a/
os/os-android.h
+++ b/
os/os-android.h
@@
-7,6
+7,7
@@
#include <sys/mman.h>
#include <sys/uio.h>
#include <sys/syscall.h>
#include <sys/mman.h>
#include <sys/uio.h>
#include <sys/syscall.h>
+#include <sys/sysmacros.h>
#include <sys/vfs.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/vfs.h>
#include <unistd.h>
#include <fcntl.h>
@@
-32,6
+33,7
@@
#define FIO_HAVE_HUGETLB
#define FIO_HAVE_BLKTRACE
#define FIO_HAVE_CL_SIZE
#define FIO_HAVE_HUGETLB
#define FIO_HAVE_BLKTRACE
#define FIO_HAVE_CL_SIZE
+#define FIO_HAVE_CGROUPS
#define FIO_HAVE_FS_STAT
#define FIO_HAVE_TRIM
#define FIO_HAVE_GETTID
#define FIO_HAVE_FS_STAT
#define FIO_HAVE_TRIM
#define FIO_HAVE_GETTID
@@
-59,19
+61,17
@@
#ifndef CONFIG_NO_SHM
/*
#ifndef CONFIG_NO_SHM
/*
- * The Android NDK doesn't currently export <sys/shm.h>, so define the
- * necessary stuff here.
+ * Bionic doesn't support SysV shared memeory, so implement it using ashmem
*/
*/
-
-#include <sys/shm.h>
-#define SHM_HUGETLB 04000
-
#include <stdio.h>
#include <linux/ashmem.h>
#include <stdio.h>
#include <linux/ashmem.h>
+#include <linux/shm.h>
+#define shmid_ds shmid64_ds
+#define SHM_HUGETLB 04000
#define ASHMEM_DEVICE "/dev/ashmem"
#define ASHMEM_DEVICE "/dev/ashmem"
-static inline int shmctl
(int __shmid, int __cmd, struct shmid_ds *__buf)
+static inline int shmctl(int __shmid, int __cmd, struct shmid_ds *__buf)
{
int ret=0;
if (__cmd == IPC_RMID)
{
int ret=0;
if (__cmd == IPC_RMID)
@@
-84,7
+84,7
@@
static inline int shmctl (int __shmid, int __cmd, struct shmid_ds *__buf)
return ret;
}
return ret;
}
-static inline int shmget
(key_t __key, size_t __size, int __shmflg)
+static inline int shmget(key_t __key, size_t __size, int __shmflg)
{
int fd,ret;
char keybuf[11];
{
int fd,ret;
char keybuf[11];
@@
-110,7
+110,7
@@
error:
return ret;
}
return ret;
}
-static inline void *shmat
(int __shmid, const void *__shmaddr, int __shmflg)
+static inline void *shmat(int __shmid, const void *__shmaddr, int __shmflg)
{
size_t size = ioctl(__shmid, ASHMEM_GET_SIZE, NULL);
/* Needs to be 8-byte aligned to prevent SIGBUS on 32-bit ARM */
{
size_t size = ioctl(__shmid, ASHMEM_GET_SIZE, NULL);
/* Needs to be 8-byte aligned to prevent SIGBUS on 32-bit ARM */
@@
-274,7
+274,7
@@
static inline unsigned long long get_fs_free_size(const char *path)
return ret;
}
return ret;
}
-static inline int os_trim(
int fd
, unsigned long long start,
+static inline int os_trim(
struct fio_file *f
, unsigned long long start,
unsigned long long len)
{
uint64_t range[2];
unsigned long long len)
{
uint64_t range[2];
@@
-282,7
+282,7
@@
static inline int os_trim(int fd, unsigned long long start,
range[0] = start;
range[1] = len;
range[0] = start;
range[1] = len;
- if (!ioctl(fd, BLKDISCARD, range))
+ if (!ioctl(f
->f
d, BLKDISCARD, range))
return 0;
return errno;
return 0;
return errno;