manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2024-11-15 09:35:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dispose Counters before they hit the finalizer queue

Browse source
This commit is contained in:
FICTURE7 2021-04-14 11:56:10 +04:00
parent 11130f7826
commit 28f43f5622
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ARMeilleure/Translation/Translator.cs
View file

@ -28,7 +28,7 @@ namespace ARMeilleure.Translation
private readonly IMemoryManager _memory; private readonly IMemoryManager _memory;
private readonly ConcurrentDictionary<ulong, TranslatedFunction> _funcs; private readonly ConcurrentDictionary<ulong, TranslatedFunction> _funcs;
private readonly ConcurrentQueue<KeyValuePair<ulong, IntPtr>> _oldFuncs; private readonly ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>> _oldFuncs;
private readonly ConcurrentDictionary<ulong, object> _backgroundSet; private readonly ConcurrentDictionary<ulong, object> _backgroundSet;
private readonly ConcurrentStack<RejitRequest> _backgroundStack; private readonly ConcurrentStack<RejitRequest> _backgroundStack;
@ -50,7 +50,7 @@ namespace ARMeilleure.Translation
_memory = memory; _memory = memory;
_funcs = new ConcurrentDictionary<ulong, TranslatedFunction>(); _funcs = new ConcurrentDictionary<ulong, TranslatedFunction>();
_oldFuncs = new ConcurrentQueue<KeyValuePair<ulong, IntPtr>>(); _oldFuncs = new ConcurrentQueue<KeyValuePair<ulong, TranslatedFunction>>();
_backgroundSet = new ConcurrentDictionary<ulong, object>(); _backgroundSet = new ConcurrentDictionary<ulong, object>();
_backgroundStack = new ConcurrentStack<RejitRequest>(); _backgroundStack = new ConcurrentStack<RejitRequest>();
@ -457,7 +457,7 @@ namespace ARMeilleure.Translation
private void EnqueueForDeletion(ulong guestAddress, TranslatedFunction func) private void EnqueueForDeletion(ulong guestAddress, TranslatedFunction func)
{ {
_oldFuncs.Enqueue(new KeyValuePair<ulong, IntPtr>(guestAddress, func.FuncPtr)); _oldFuncs.Enqueue(new(guestAddress, func));
} }
private void ClearJitCache() private void ClearJitCache()
@ -465,16 +465,20 @@ namespace ARMeilleure.Translation
// Ensure no attempt will be made to compile new functions due to rejit. // Ensure no attempt will be made to compile new functions due to rejit.
ClearRejitQueue(allowRequeue: false); ClearRejitQueue(allowRequeue: false);
foreach (var kv in _funcs) foreach (var func in _funcs.Values)
{ {
JitCache.Unmap(kv.Value.FuncPtr); JitCache.Unmap(func.FuncPtr);
func.CallCounter?.Dispose();
} }
_funcs.Clear(); _funcs.Clear();
while (_oldFuncs.TryDequeue(out var kv)) while (_oldFuncs.TryDequeue(out var kv))
{ {
JitCache.Unmap(kv.Value); JitCache.Unmap(kv.Value.FuncPtr);
kv.Value.CallCounter?.Dispose();
} }
} }