guozanhua/MeloNX
1
0
Fork 0
forked from MeloNX/MeloNX
Code Pull Requests Activity

fix shared memory thread safety

Browse Source
This commit is contained in:
riperiperi 2024-01-06 20:13:06 +00:00
parent 2bbf829a09
commit e9ab106f8f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Ryujinx.Memory/MemoryManagementUnix.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
@ -141,7 +141,7 @@ namespace Ryujinx.Memory
return munmap(address, size) == 0; return munmap(address, size) == 0;
} }
private static Dictionary<IntPtr, ulong> _sharedMemorySizes = new Dictionary<nint, ulong>(); private static ConcurrentDictionary<IntPtr, ulong> _sharedMemorySizes = new ConcurrentDictionary<nint, ulong>();
public unsafe static IntPtr CreateSharedMemory(ulong size, bool reserve) public unsafe static IntPtr CreateSharedMemory(ulong size, bool reserve)
{ {
@ -151,7 +151,7 @@ namespace Ryujinx.Memory
{ {
IntPtr baseAddress = MachJitWorkaround.AllocateSharedMemory(size, reserve); IntPtr baseAddress = MachJitWorkaround.AllocateSharedMemory(size, reserve);
_sharedMemorySizes.Add(baseAddress, size); _sharedMemorySizes.TryAdd(baseAddress, size);
return baseAddress; return baseAddress;
} }
@ -206,6 +206,7 @@ namespace Ryujinx.Memory
{ {
if (_sharedMemorySizes.TryGetValue(handle, out ulong size)) if (_sharedMemorySizes.TryGetValue(handle, out ulong size))
{ {
_sharedMemorySizes.Remove(handle, out _);
MachJitWorkaround.DestroySharedMemory(handle, size); MachJitWorkaround.DestroySharedMemory(handle, size);
} }
} }