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 1d11cccde42bdd8b1db35bf016ccb65d8f38ac62..acb19a8adea70d9c150a4554a83d1bcd1ee7e6f9 100644 (file)
--- a/os/os-android.h
+++ b/os/os-android.h
@@ -57,22 +57,19 @@
 #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 <sys/mman.h>
+#include <linux/shm.h>
+#define shmid_ds shmid64_ds
+#define SHM_HUGETLB    04000
 
 #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)
@@ -85,17 +82,17 @@ static inline int shmctl (int __shmid, int __cmd, struct shmid_ds *__buf)
        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 key[11];
-       
+       char keybuf[11];
+
        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;
 
@@ -104,13 +101,13 @@ static inline int shmget (key_t __key, size_t __size, int __shmflg)
                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)
 {
        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);
@@ -126,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));
 }
+#endif
 
 #define SPLICE_DEF_SIZE        (64*1024)