piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

MemArena: Prepare interface for proper memory reservation.

Browse Source
This commit is contained in:
Admiral H. Curtiss
2021-06-21 02:13:00 +02:00
parent 812cc8b632
commit 1554128560
5 changed files with 176 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,9 @@ static int AshmemCreateFileMapping(const char* name, size_t size)
return fd;
}
MemArena::MemArena() = default;
MemArena::~MemArena() = default;
void MemArena::GrabSHMSegment(size_t size)
{
fd = AshmemCreateFileMapping(("dolphin-emu." + std::to_string(getpid())).c_str(), size);
@ -71,7 +74,37 @@ void MemArena::ReleaseSHMSegment()
close(fd);
}
void* MemArena::CreateView(s64 offset, size_t size, void* base)
void* MemArena::CreateView(s64 offset, size_t size)
{
return MapInMemoryRegion(offset, size, nullptr);
}
void MemArena::ReleaseView(void* view, size_t size)
{
UnmapFromMemoryRegion(view, size);
}
u8* MemArena::ReserveMemoryRegion(size_t memory_size)
{
// Android 4.3 changed how mmap works.
// if we map it private and then munmap it, we can't use the base returned.
// This may be due to changes in them to support a full SELinux implementation.
const int flags = MAP_ANON | MAP_SHARED;
void* base = mmap(nullptr, memory_size, PROT_NONE, flags, -1, 0);
if (base == MAP_FAILED)
{
PanicAlertFmt("Failed to map enough memory space: {}", LastStrerrorString());
return nullptr;
}
munmap(base, memory_size);
return static_cast<u8*>(base);
}
void MemArena::ReleaseMemoryRegion()
{
}
void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
{
void* retval = mmap(base, size, PROT_READ | PROT_WRITE,
MAP_SHARED | ((base == nullptr) ? 0 : MAP_FIXED), fd, offset);
@ -87,30 +120,8 @@ void* MemArena::CreateView(s64 offset, size_t size, void* base)
}
}
void MemArena::ReleaseView(void* view, size_t size)
void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
{
munmap(view, size);
}
u8* MemArena::FindMemoryBase()
{
#if _ARCH_32
const size_t memory_size = 0x31000000;
#else
const size_t memory_size = 0x400000000;
#endif
// Android 4.3 changed how mmap works.
// if we map it private and then munmap it, we can't use the base returned.
// This may be due to changes in them to support a full SELinux implementation.
const int flags = MAP_ANON | MAP_SHARED;
void* base = mmap(nullptr, memory_size, PROT_NONE, flags, -1, 0);
if (base == MAP_FAILED)
{
PanicAlertFmt("Failed to map enough memory space: {}", LastStrerrorString());
return nullptr;
}
munmap(base, memory_size);
return static_cast<u8*>(base);
}
} // namespace Common