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 70d05702f385576208e1dcef7309438b943749dc..acb19a8adea70d9c150a4554a83d1bcd1ee7e6f9 100644 (file)
--- a/os/os-android.h
+++ b/os/os-android.h
@@ -16,9 +16,14 @@
 #include <linux/major.h>
 #include <asm/byteorder.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_IOPRIO
 #define FIO_HAVE_DISK_UTIL
 #define FIO_HAVE_IOSCHED_SWITCH
 #define FIO_HAVE_IOPRIO


@@ -26,7 +31,6 @@
 #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


@@ -53,22 +57,19 @@
 #define MAP_HUGETLB 0x40000 /* arch specific */
 #endif
 
 #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 <linux/shm.h>
-#define SHM_HUGETLB    04000
-

 #include <stdio.h>
 #include <linux/ashmem.h>
 #include <stdio.h>
 #include <linux/ashmem.h>

-#include <sys/mman.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)


@@ -81,17 +82,17 @@ 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;
 {
        int fd,ret;

-       char key[11];
-       
+       char keybuf[11];
+

        fd = open(ASHMEM_DEVICE, O_RDWR);
        if (fd < 0)
                return fd;
 
        fd = open(ASHMEM_DEVICE, O_RDWR);
        if (fd < 0)
                return fd;
 

-       sprintf(key,"%d",__key);
-       ret = ioctl(fd, ASHMEM_SET_NAME, key);
+       sprintf(keybuf,"%d",__key);
+       ret = ioctl(fd, ASHMEM_SET_NAME, keybuf);

        if (ret < 0)
                goto error;
 
        if (ret < 0)
                goto error;
 


@@ -100,13 +101,13 @@ static inline int shmget (key_t __key, size_t __size, int __shmflg)
                goto error;
 
        return fd;
                goto error;
 
        return fd;

-       
+

 error:
        close(fd);
        return ret;
 }
 
 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)

 {
        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);
 {
        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);


@@ -122,6 +123,7 @@ static inline int shmdt (const void *__shmaddr)
        size = *ptr;    //find mmap size which we stored at the beginning of the buffer
        return munmap((void *)ptr, size + sizeof(size_t));
 }
        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)
 


@@ -219,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"