Recent changes (master)
The following changes since commit b54e0d80c52e626021aacd0ae4d9875940cff9aa:
Merge branch 'taras/nfs-upstream' of https://github.com/tarasglek/fio-1 (2021-05-18 17:34:38 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to c91fd13d479dc38bbb7ef6995256ad098ebbceb2:
Merge branch 'master' of https://github.com/DevriesL/fio (2021-05-25 16:54:13 -0600)
----------------------------------------------------------------
DevriesL (1):
android: add support for NDK sharedmem
Jens Axboe (1):
Merge branch 'master' of https://github.com/DevriesL/fio
os/os-android.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
---
Diff of recent changes:
os/os-android.h +17 -2
@@ -71,11 +71,15 @@#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 ASHMEM_DEVICE "/dev/ashmem" -static inline int shmctl (int __shmid,int __cmd,struct shmid_ds *__buf) {int ret=0 ;
@@ -89,6 +93,16 @@ static inline int shmctl(int __shmid, int __cmd, struct shmid_ds *__buf)return ret; } +#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) {int fd,ret;
@@ -114,6 +128,7 @@ error:close (fd); return ret; } +#endif static inline void *shmat (int __shmid,const void *__shmaddr,int __shmflg) {