deadcade/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a thread sync bug as is the usual...

Browse source
This commit is contained in:
gdkchan 2018-06-09 22:41:07 -03:00
parent aa75957ce2
commit adeb8793c2
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Ryujinx.Core/OsHle/Kernel/SvcThreadSync.cs
View file

@ -254,7 +254,7 @@ namespace Ryujinx.Core.OsHle.Kernel
WaitThread.MutexAddress = MutexAddress; WaitThread.MutexAddress = MutexAddress;
WaitThread.CondVarAddress = CondVarAddress; WaitThread.CondVarAddress = CondVarAddress;
lock (Process.ThreadArbiterList) lock (Process.ThreadSyncLock)
{ {
WaitThread.CondVarSignaled = false; WaitThread.CondVarSignaled = false;
@ -267,12 +267,18 @@ namespace Ryujinx.Core.OsHle.Kernel
{ {
Process.Scheduler.EnterWait(WaitThread, NsTimeConverter.GetTimeMs(Timeout)); Process.Scheduler.EnterWait(WaitThread, NsTimeConverter.GetTimeMs(Timeout));
lock (Process.ThreadArbiterList) lock (Process.ThreadSyncLock)
{ {
if (!WaitThread.CondVarSignaled) WaitThread.MutexOwner?.MutexWaiters.Remove(WaitThread);
if (!WaitThread.CondVarSignaled || WaitThread.MutexOwner != null)
{ {
WaitThread.MutexOwner = null;
Process.ThreadArbiterList.Remove(WaitThread); Process.ThreadArbiterList.Remove(WaitThread);
Ns.Log.PrintDebug(LogClass.KernelSvc, "Timed out...");
return false; return false;
} }
} }
@ -287,7 +293,7 @@ namespace Ryujinx.Core.OsHle.Kernel
private void CondVarSignal(KThread CurrThread, long CondVarAddress, int Count) private void CondVarSignal(KThread CurrThread, long CondVarAddress, int Count)
{ {
lock (Process.ThreadArbiterList) lock (Process.ThreadSyncLock)
{ {
while (Count == -1 || Count-- > 0) while (Count == -1 || Count-- > 0)
{ {