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

MemArena: Use names that are based on the PID 

Fixes a regression which broke running several Dolphin instances at the
same time on Windows. Thanks to exjam for spotting the issue
pretty much immediately. Sorry about that!

Also changes the file names to be more consistent on all platforms.
This commit is contained in:
Léo Lam 2017-10-11 17:17:25 +02:00
parent 2dfbf866fb
commit 28d648b802
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Core/Common/MemArena.cpp
View File

@ -55,31 +55,25 @@ static int AshmemCreateFileMapping(const char* name, size_t size)
void MemArena::GrabSHMSegment(size_t size) void MemArena::GrabSHMSegment(size_t size)
{ {
#ifdef _WIN32 #ifdef _WIN32
const std::string name = "dolphin-emu." + std::to_string(GetCurrentProcessId());
hMemoryMapping = CreateFileMapping(INVALID_HANDLE_VALUE, nullptr, PAGE_READWRITE, 0, hMemoryMapping = CreateFileMapping(INVALID_HANDLE_VALUE, nullptr, PAGE_READWRITE, 0,
static_cast<DWORD>(size), L"Dolphin-emu"); static_cast<DWORD>(size), UTF8ToTStr(name).c_str());
#elif defined(ANDROID) #elif defined(ANDROID)
fd = AshmemCreateFileMapping("Dolphin-emu", size); fd = AshmemCreateFileMapping(("dolphin-emu." + std::to_string(getpid())).c_str(), size);
if (fd < 0) if (fd < 0)
{ {
NOTICE_LOG(MEMMAP, "Ashmem allocation failed"); NOTICE_LOG(MEMMAP, "Ashmem allocation failed");
return; return;
} }
#else #else
for (int i = 0; i < 10000; i++) const std::string file_name = "/dolphin-emu." + std::to_string(getpid());
fd = shm_open(file_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600);
if (fd == -1)
{ {
std::string file_name = StringFromFormat("/dolphinmem.%d", i); ERROR_LOG(MEMMAP, "shm_open failed: %s", strerror(errno));
fd = shm_open(file_name.c_str(), O_RDWR | O_CREAT | O_EXCL, 0600); return;
if (fd != -1)
{
shm_unlink(file_name.c_str());
break;
}
else if (errno != EEXIST)
{
ERROR_LOG(MEMMAP, "shm_open failed: %s", strerror(errno));
return;
}
} }
shm_unlink(file_name.c_str());
if (ftruncate(fd, size) < 0) if (ftruncate(fd, size) < 0)
ERROR_LOG(MEMMAP, "Failed to allocate low memory space"); ERROR_LOG(MEMMAP, "Failed to allocate low memory space");
#endif #endif