From 8342164dbdf6d862556de017f67ff28ecde0f0ec Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Thu, 11 May 2023 01:51:43 +0200 Subject: Common/MemArena: Pass shared memory base file name to GrabSHMSegment(). --- Source/Core/Common/MemArenaAndroid.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Source/Core/Common/MemArenaAndroid.cpp') diff --git a/Source/Core/Common/MemArenaAndroid.cpp b/Source/Core/Common/MemArenaAndroid.cpp index 721925d213..01b210100a 100644 --- a/Source/Core/Common/MemArenaAndroid.cpp +++ b/Source/Core/Common/MemArenaAndroid.cpp @@ -10,6 +10,8 @@ #include #include +#include + #include #include #include @@ -62,9 +64,10 @@ static int AshmemCreateFileMapping(const char* name, size_t size) MemArena::MemArena() = default; MemArena::~MemArena() = default; -void MemArena::GrabSHMSegment(size_t size) +void MemArena::GrabSHMSegment(size_t size, std::string_view base_name) { - m_shm_fd = AshmemCreateFileMapping(("dolphin-emu." + std::to_string(getpid())).c_str(), size); + const std::string name = fmt::format("{}.{}", base_name, getpid()); + m_shm_fd = AshmemCreateFileMapping(name.c_str(), size); if (m_shm_fd < 0) NOTICE_LOG_FMT(MEMMAP, "Ashmem allocation failed"); } -- cgit v1.2.3