os/os-android.h: fix compilation for Android O

[fio.git] / os / os-android.h

diff --git a/os/os-android.h b/os/os-android.h
index cedfdaf8ea8ca0910715580a08ee317d8fc3dd12..acb19a8adea70d9c150a4554a83d1bcd1ee7e6f9 100644 (file)
--- a/os/os-android.h
+++ b/os/os-android.h
@@ -4,6 +4,7 @@
 #define        FIO_OS  os_android
 
 #include <sys/ioctl.h>
 #define        FIO_OS  os_android
 
 #include <sys/ioctl.h>

+#include <sys/mman.h>

 #include <sys/uio.h>
 #include <sys/syscall.h>
 #include <sys/vfs.h>
 #include <sys/uio.h>
 #include <sys/syscall.h>
 #include <sys/vfs.h>


@@ -13,16 +14,23 @@
 #include <sched.h>
 #include <linux/unistd.h>
 #include <linux/major.h>
 #include <sched.h>
 #include <linux/unistd.h>
 #include <linux/major.h>

+#include <asm/byteorder.h>

 
 

+#include "./os-linux-syscall.h"

 #include "binject.h"
 #include "../file.h"
 
 #include "binject.h"
 #include "../file.h"
 

+#ifndef __has_builtin         // Optional of course.
+  #define __has_builtin(x) 0  // Compatibility with non-clang compilers.
+#endif
+

 #define FIO_HAVE_DISK_UTIL
 #define FIO_HAVE_IOSCHED_SWITCH
 #define FIO_HAVE_DISK_UTIL
 #define FIO_HAVE_IOSCHED_SWITCH

+#define FIO_HAVE_IOPRIO
+#define FIO_HAVE_IOPRIO_CLASS

 #define FIO_HAVE_ODIRECT
 #define FIO_HAVE_HUGETLB
 #define FIO_HAVE_BLKTRACE
 #define FIO_HAVE_ODIRECT
 #define FIO_HAVE_HUGETLB
 #define FIO_HAVE_BLKTRACE

-#define FIO_HAVE_PSHARED_MUTEX

 #define FIO_HAVE_CL_SIZE
 #define FIO_HAVE_FS_STAT
 #define FIO_HAVE_TRIM
 #define FIO_HAVE_CL_SIZE
 #define FIO_HAVE_FS_STAT
 #define FIO_HAVE_TRIM


@@ -31,49 +39,128 @@
 #define FIO_HAVE_E4_ENG
 #define FIO_HAVE_BYTEORDER_FUNCS
 #define FIO_HAVE_MMAP_HUGE
 #define FIO_HAVE_E4_ENG
 #define FIO_HAVE_BYTEORDER_FUNCS
 #define FIO_HAVE_MMAP_HUGE

+#define FIO_NO_HAVE_SHM_H

 
 #define OS_MAP_ANON            MAP_ANONYMOUS
 
 
 #define OS_MAP_ANON            MAP_ANONYMOUS
 

+#ifndef POSIX_MADV_DONTNEED

 #define posix_madvise   madvise
 #define POSIX_MADV_DONTNEED MADV_DONTNEED
 #define POSIX_MADV_SEQUENTIAL  MADV_SEQUENTIAL
 #define POSIX_MADV_RANDOM      MADV_RANDOM
 #define posix_madvise   madvise
 #define POSIX_MADV_DONTNEED MADV_DONTNEED
 #define POSIX_MADV_SEQUENTIAL  MADV_SEQUENTIAL
 #define POSIX_MADV_RANDOM      MADV_RANDOM

+#endif
+

 #ifdef MADV_REMOVE
 #define FIO_MADV_FREE  MADV_REMOVE
 #endif
 #ifdef MADV_REMOVE
 #define FIO_MADV_FREE  MADV_REMOVE
 #endif

+#ifndef MAP_HUGETLB
+#define MAP_HUGETLB 0x40000 /* arch specific */
+#endif

 
 

-
+#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 <stdio.h>
+#include <linux/ashmem.h>

 #include <linux/shm.h>
 #include <linux/shm.h>

+#define shmid_ds shmid64_ds

 #define SHM_HUGETLB    04000
 
 #define SHM_HUGETLB    04000
 

-static inline int shmctl (int __shmid, int __cmd, struct shmid_ds *__buf)
+#define ASHMEM_DEVICE  "/dev/ashmem"
+
+static inline int shmctl(int __shmid, int __cmd, struct shmid_ds *__buf)

 {
 {

-       return syscall(__NR_shmctl, __shmid, __cmd, __buf);
+       int ret=0;
+       if (__cmd == IPC_RMID)
+       {
+               int length = ioctl(__shmid, ASHMEM_GET_SIZE, NULL);
+               struct ashmem_pin pin = {0 , length};
+               ret = ioctl(__shmid, ASHMEM_UNPIN, &pin);
+               close(__shmid);
+       }
+       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)

 {
 {

-       return syscall(__NR_shmget, __key, __size, __shmflg);
+       int fd,ret;
+       char keybuf[11];
+
+       fd = open(ASHMEM_DEVICE, O_RDWR);
+       if (fd < 0)
+               return fd;
+
+       sprintf(keybuf,"%d",__key);
+       ret = ioctl(fd, ASHMEM_SET_NAME, keybuf);
+       if (ret < 0)
+               goto error;
+
+       ret = ioctl(fd, ASHMEM_SET_SIZE, __size);
+       if (ret < 0)
+               goto error;
+
+       return fd;
+
+error:
+       close(fd);
+       return ret;

 }
 
 }
 

-static inline void *shmat (int __shmid, const void *__shmaddr, int __shmflg)
+static inline void *shmat(int __shmid, const void *__shmaddr, int __shmflg)

 {
 {

-       return (void *)syscall(__NR_shmat, __shmid, __shmaddr, __shmflg);
+       size_t *ptr, size = ioctl(__shmid, ASHMEM_GET_SIZE, NULL);
+       ptr = mmap(NULL, size + sizeof(size_t), PROT_READ | PROT_WRITE, MAP_SHARED, __shmid, 0);
+       *ptr = size;    //save size at beginning of buffer, for use with munmap
+       return &ptr[1];

 }
 
 static inline int shmdt (const void *__shmaddr)
 {
 }
 
 static inline int shmdt (const void *__shmaddr)
 {

-       return syscall(__NR_shmctl, __shmaddr);
+       size_t *ptr, size;
+       ptr = (size_t *)__shmaddr;
+       ptr--;
+       size = *ptr;    //find mmap size which we stored at the beginning of the buffer
+       return munmap((void *)ptr, size + sizeof(size_t));

 }
 }

-
+#endif

 
 #define SPLICE_DEF_SIZE        (64*1024)
 
 
 #define SPLICE_DEF_SIZE        (64*1024)
 

+enum {
+       IOPRIO_CLASS_NONE,
+       IOPRIO_CLASS_RT,
+       IOPRIO_CLASS_BE,
+       IOPRIO_CLASS_IDLE,
+};
+
+enum {
+       IOPRIO_WHO_PROCESS = 1,
+       IOPRIO_WHO_PGRP,
+       IOPRIO_WHO_USER,
+};
+
+#define IOPRIO_BITS            16
+#define IOPRIO_CLASS_SHIFT     13
+
+#define IOPRIO_MIN_PRIO                0       /* highest priority */
+#define IOPRIO_MAX_PRIO                7       /* lowest priority */
+
+#define IOPRIO_MIN_PRIO_CLASS  0
+#define IOPRIO_MAX_PRIO_CLASS  3
+
+static inline int ioprio_set(int which, int who, int ioprio_class, int ioprio)
+{
+       /*
+        * If no class is set, assume BE
+        */
+       if (!ioprio_class)
+               ioprio_class = IOPRIO_CLASS_BE;
+
+       ioprio |= ioprio_class << IOPRIO_CLASS_SHIFT;
+       return syscall(__NR_ioprio_set, which, who, ioprio);
+}
+

 #ifndef BLKGETSIZE64
 #define BLKGETSIZE64   _IOR(0x12,114,size_t)
 #endif
 #ifndef BLKGETSIZE64
 #define BLKGETSIZE64   _IOR(0x12,114,size_t)
 #endif


@@ -134,9 +221,19 @@ static inline long os_random_long(os_random_state_t *rs)
 #define FIO_O_NOATIME  0
 #endif
 
 #define FIO_O_NOATIME  0
 #endif
 

-#define fio_swap16(x)  __bswap_16(x)
-#define fio_swap32(x)  __bswap_32(x)
-#define fio_swap64(x)  __bswap_64(x)
+/* Check for GCC or Clang byte swap intrinsics */
+#if (__has_builtin(__builtin_bswap16) && __has_builtin(__builtin_bswap32) \
+     && __has_builtin(__builtin_bswap64)) || (__GNUC__ > 4 \
+     || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) /* fio_swapN */
+#define fio_swap16(x)  __builtin_bswap16(x)
+#define fio_swap32(x)  __builtin_bswap32(x)
+#define fio_swap64(x)  __builtin_bswap64(x)
+#else
+#include <byteswap.h>
+#define fio_swap16(x)  bswap_16(x)
+#define fio_swap32(x)  bswap_32(x)
+#define fio_swap64(x)  bswap_64(x)
+#endif /* fio_swapN */

 
 #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"


@@ -160,7 +257,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;


@@ -187,4 +284,12 @@ static inline int os_trim(int fd, unsigned long long start,
        return errno;
 }
 
        return errno;
 }
 

+#ifdef CONFIG_SCHED_IDLE
+static inline int fio_set_sched_idle(void)
+{
+        struct sched_param p = { .sched_priority = 0, };
+        return sched_setscheduler(gettid(), SCHED_IDLE, &p);
+}
+#endif
+

 #endif
 #endif