ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11823 from AdmiralCurtiss/mmap-android 

Common/MemArenaAndroid: Keep fastmem region mapped.
This commit is contained in:
Admiral H. Curtiss 2023-05-19 18:42:33 +02:00 committed by GitHub
parent 11768e3dd3 ab98db445d
commit b0d7fa9eb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Common/MemArena.h
View File

@ -113,13 +113,9 @@ private:
void* m_address_VirtualAlloc2 = nullptr; void* m_address_VirtualAlloc2 = nullptr;
void* m_address_MapViewOfFile3 = nullptr; void* m_address_MapViewOfFile3 = nullptr;
#else #else
#ifdef ANDROID int m_shm_fd = 0;
int fd; void* m_reserved_region = nullptr;
#else std::size_t m_reserved_region_size = 0;
int m_shm_fd;
void* m_reserved_region;
std::size_t m_reserved_region_size;
#endif
#endif #endif
}; };

35
Source/Core/Common/MemArenaAndroid.cpp
View File

@ -64,24 +64,33 @@ MemArena::~MemArena() = default;
void MemArena::GrabSHMSegment(size_t size) void MemArena::GrabSHMSegment(size_t size)
{ {
fd = AshmemCreateFileMapping(("dolphin-emu." + std::to_string(getpid())).c_str(), size); m_shm_fd = AshmemCreateFileMapping(("dolphin-emu." + std::to_string(getpid())).c_str(), size);
if (fd < 0) if (m_shm_fd < 0)
NOTICE_LOG_FMT(MEMMAP, "Ashmem allocation failed"); NOTICE_LOG_FMT(MEMMAP, "Ashmem allocation failed");
} }
void MemArena::ReleaseSHMSegment() void MemArena::ReleaseSHMSegment()
{ {
close(fd); close(m_shm_fd);
} }
void* MemArena::CreateView(s64 offset, size_t size) void* MemArena::CreateView(s64 offset, size_t size)
{ {
return MapInMemoryRegion(offset, size, nullptr); void* retval = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED, m_shm_fd, offset);
if (retval == MAP_FAILED)
{
NOTICE_LOG_FMT(MEMMAP, "mmap failed");
return nullptr;
}
else
{
return retval;
}
} }
void MemArena::ReleaseView(void* view, size_t size) void MemArena::ReleaseView(void* view, size_t size)
{ {
UnmapFromMemoryRegion(view, size); munmap(view, size);
} }
u8* MemArena::ReserveMemoryRegion(size_t memory_size) u8* MemArena::ReserveMemoryRegion(size_t memory_size)
@ -96,19 +105,23 @@ u8* MemArena::ReserveMemoryRegion(size_t memory_size)
PanicAlertFmt("Failed to map enough memory space: {}", LastStrerrorString()); PanicAlertFmt("Failed to map enough memory space: {}", LastStrerrorString());
return nullptr; return nullptr;
} }
munmap(base, memory_size); m_reserved_region = base;
m_reserved_region_size = memory_size;
return static_cast<u8*>(base); return static_cast<u8*>(base);
} }
void MemArena::ReleaseMemoryRegion() void MemArena::ReleaseMemoryRegion()
{ {
if (m_reserved_region)
{
munmap(m_reserved_region, m_reserved_region_size);
m_reserved_region = nullptr;
}
} }
void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base) void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
{ {
void* retval = mmap(base, size, PROT_READ | PROT_WRITE, void* retval = mmap(base, size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, m_shm_fd, offset);
MAP_SHARED | ((base == nullptr) ? 0 : MAP_FIXED), fd, offset);
if (retval == MAP_FAILED) if (retval == MAP_FAILED)
{ {
NOTICE_LOG_FMT(MEMMAP, "mmap failed"); NOTICE_LOG_FMT(MEMMAP, "mmap failed");
@ -122,6 +135,8 @@ void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
void MemArena::UnmapFromMemoryRegion(void* view, size_t size) void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
{ {
munmap(view, size); void* retval = mmap(view, size, PROT_NONE, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
if (retval == MAP_FAILED)
NOTICE_LOG_FMT(MEMMAP, "mmap failed");
} }
} // namespace Common } // namespace Common