Split os-android.h

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

diff --git a/os/os-android.h b/os/os-android.h
index 2f73d249d5a16e69aaacca5634b1b85a72410955..146f5138cd9e653d3fba8a6d8690619462f43ea3 100644 (file)
--- a/os/os-android.h
+++ b/os/os-android.h
@@ -24,6 +24,7 @@
   #define __has_builtin(x) 0  // Compatibility with non-clang compilers.
 #endif
 
+#define FIO_HAVE_CPU_AFFINITY
 #define FIO_HAVE_DISK_UTIL
 #define FIO_HAVE_IOSCHED_SWITCH
 #define FIO_HAVE_IOPRIO
@@ -44,6 +45,13 @@
 
 #define OS_MAP_ANON            MAP_ANONYMOUS
 
+typedef cpu_set_t os_cpu_mask_t;
+
+#define fio_setaffinity(pid, cpumask)          \
+       sched_setaffinity((pid), sizeof(cpumask), &(cpumask))
+#define fio_getaffinity(pid, ptr)      \
+       sched_getaffinity((pid), sizeof(cpu_set_t), (ptr))
+
 #ifndef POSIX_MADV_DONTNEED
 #define posix_madvise   madvise
 #define POSIX_MADV_DONTNEED MADV_DONTNEED
@@ -64,90 +72,25 @@
        pthread_getaffinity_np(pthread_self(), sizeof(mask), &(mask))
 #endif
 
-#ifndef CONFIG_NO_SHM
-/*
- * Bionic doesn't support SysV shared memory, so implement it using ashmem
- */
-#include <stdio.h>
-#include <linux/ashmem.h>
-#include <linux/shm.h>
-#include <android/api-level.h>
-#if __ANDROID_API__ >= __ANDROID_API_O__
-#include <android/sharedmem.h>
-#else
-#define ASHMEM_DEVICE  "/dev/ashmem"
-#endif
-#define shmid_ds shmid64_ds
-#define SHM_HUGETLB    04000
+#define fio_cpu_clear(mask, cpu)       CPU_CLR((cpu), (mask))
+#define fio_cpu_set(mask, cpu)         CPU_SET((cpu), (mask))
+#define fio_cpu_isset(mask, cpu)       (CPU_ISSET((cpu), (mask)) != 0)
+#define fio_cpu_count(mask)            CPU_COUNT((mask))
 
-static inline int shmctl(int __shmid, int __cmd, struct shmid_ds *__buf)
+static inline int fio_cpuset_init(os_cpu_mask_t *mask)
 {
-       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;
+       CPU_ZERO(mask);
+       return 0;
 }
 
-#if __ANDROID_API__ >= __ANDROID_API_O__
-static inline int shmget(key_t __key, size_t __size, int __shmflg)
-{
-       char keybuf[11];
-
-       sprintf(keybuf, "%d", __key);
-
-       return ASharedMemory_create(keybuf, __size + sizeof(uint64_t));
-}
-#else
-static inline int shmget(key_t __key, size_t __size, int __shmflg)
+static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
 {
-       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;
-
-       /* Stores size in first 8 bytes, allocate extra space */
-       ret = ioctl(fd, ASHMEM_SET_SIZE, __size + sizeof(uint64_t));
-       if (ret < 0)
-               goto error;
-
-       return fd;
-
-error:
-       close(fd);
-       return ret;
+       return 0;
 }
-#endif
 
-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 */
-       uint64_t *ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, __shmid, 0);
-       /* Save size at beginning of buffer, for use with munmap */
-       *ptr = size;
-       return ptr + 1;
-}
+#define FIO_MAX_CPUS                   CPU_SETSIZE
 
-static inline int shmdt (const void *__shmaddr)
-{
-       /* Find mmap size which we stored at the beginning of the buffer */
-       uint64_t *ptr = (uint64_t *)__shmaddr - 1;
-       size_t size = *ptr;
-       return munmap(ptr, size);
-}
-#endif
+#include "os-ashmem.h"
 
 #define SPLICE_DEF_SIZE        (64*1024)