Mirrors/asmjit
1
0
Fork 0
mirror of https://github.com/asmjit/asmjit.git synced 2025-12-17 12:34:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

[Bug] Fixed android build (Android doesn't provide shm_open() and shm_unlink() functions)

Browse Source
This commit is contained in:
kobalicek
2021-05-16 09:33:45 +02:00
parent 0dd16b0a98
commit 8ee4c76ee3
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/asmjit/core/virtmem.cpp
View File

@@ -62,12 +62,19 @@
#include <atomic> #include <atomic>
#if defined(__APPLE__) #if defined(__APPLE__) || defined(__BIONIC__)
#define ASMJIT_VM_SHM_DETECT 0 #define ASMJIT_VM_SHM_DETECT 0
#else #else
#define ASMJIT_VM_SHM_DETECT 1 #define ASMJIT_VM_SHM_DETECT 1
#endif #endif
// Android NDK doesn't provide `shm_open()` and `shm_unlink()`.
#if defined(__BIONIC__)
#define ASMJIT_VM_SHM_AVAILABLE 0
#else
#define ASMJIT_VM_SHM_AVAILABLE 1
#endif
ASMJIT_BEGIN_NAMESPACE ASMJIT_BEGIN_NAMESPACE
// ============================================================================ // ============================================================================
@@ -341,7 +348,9 @@ public:
bits -= uint64_t(OSUtils::getTickCount()) * 773703683; bits -= uint64_t(OSUtils::getTickCount()) * 773703683;
bits = ((bits >> 14) ^ (bits << 6)) + uint64_t(++internalCounter) * 10619863; bits = ((bits >> 14) ^ (bits << 6)) + uint64_t(++internalCounter) * 10619863;
if (!ASMJIT_VM_SHM_DETECT || preferTmpOverDevShm) { bool useTmp = !ASMJIT_VM_SHM_DETECT || preferTmpOverDevShm;
if (useTmp) {
_tmpName.assign(VirtMem_getTmpDir()); _tmpName.assign(VirtMem_getTmpDir());
_tmpName.appendFormat(kShmFormat, (unsigned long long)bits); _tmpName.appendFormat(kShmFormat, (unsigned long long)bits);
_fd = ::open(_tmpName.data(), O_RDWR | O_CREAT | O_EXCL, 0); _fd = ::open(_tmpName.data(), O_RDWR | O_CREAT | O_EXCL, 0);
@@ -350,6 +359,7 @@ public:
return kErrorOk; return kErrorOk;
} }
} }
#if !ASMJIT_VM_SHM_AVAILABLE
else { else {
_tmpName.assignFormat(kShmFormat, (unsigned long long)bits); _tmpName.assignFormat(kShmFormat, (unsigned long long)bits);
_fd = ::shm_open(_tmpName.data(), O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); _fd = ::shm_open(_tmpName.data(), O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
@@ -358,6 +368,7 @@ public:
return kErrorOk; return kErrorOk;
} }
} }
#endif
int e = errno; int e = errno;
if (e != EEXIST) if (e != EEXIST)
@@ -372,10 +383,17 @@ public:
FileType type = _fileType; FileType type = _fileType;
_fileType = kFileTypeNone; _fileType = kFileTypeNone;
if (type == kFileTypeShm) #if !ASMJIT_VM_SHM_AVAILABLE
if (type == kFileTypeShm) {
::shm_unlink(_tmpName.data()); ::shm_unlink(_tmpName.data());
else if (type == kFileTypeTmp) return;
}
#endif
if (type == kFileTypeTmp) {
::unlink(_tmpName.data()); ::unlink(_tmpName.data());
return;
}
} }
void close() noexcept { void close() noexcept {