vleeuwenmenno/Ryujinx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing check for thread termination on ArbitrateLock (#4722)

Browse Source 
* Add missing check for thread termination on ArbitrateLock

* Use TerminationRequested in all places where it can be used
This commit is contained in:
gdkchan
2023-04-25 19:33:14 -03:00
committed by GitHub
parent db4242c5dc
commit 097562bc6c
5 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Ryujinx.HLE/HOS/Kernel/Threading/KAddressArbiter.cs
View File

@@ -31,6 +31,13 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
_context.CriticalSection.Enter();
if (currentThread.TerminationRequested)
{
_context.CriticalSection.Leave();
return KernelResult.ThreadTerminating;
}
currentThread.SignaledObj = null;
currentThread.ObjSyncResult = Result.Success;
@@ -114,8 +121,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
currentThread.SignaledObj = null;
currentThread.ObjSyncResult = KernelResult.TimedOut;
if (currentThread.ShallBeTerminated ||
currentThread.SchedFlags == ThreadSchedState.TerminationPending)
if (currentThread.TerminationRequested)
{
_context.CriticalSection.Leave();
@@ -280,8 +286,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
_context.CriticalSection.Enter();
if (currentThread.ShallBeTerminated ||
currentThread.SchedFlags == ThreadSchedState.TerminationPending)
if (currentThread.TerminationRequested)
{
_context.CriticalSection.Leave();
@@ -351,8 +356,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
_context.CriticalSection.Enter();
if (currentThread.ShallBeTerminated ||
currentThread.SchedFlags == ThreadSchedState.TerminationPending)
if (currentThread.TerminationRequested)
{
_context.CriticalSection.Leave();