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

Check that the mutex address matches before waking a waiting thread

Browse source
This commit is contained in:
gdkchan 2018-04-21 14:15:36 -03:00
commit babfcde885
1 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -187,8 +187,17 @@ namespace Ryujinx.Core.OsHle.Kernel
return false; return false;
} }
lock (CurrThread)
{
//This is the new thread that will not own the mutex.
//If no threads are waiting for the lock, then it should be null.
KThread OwnerThread = CurrThread.NextMutexThread; KThread OwnerThread = CurrThread.NextMutexThread;
while (OwnerThread?.NextMutexThread != null && OwnerThread.MutexAddress != MutexAddress)
{
OwnerThread = OwnerThread.NextMutexThread;
}
CurrThread.NextMutexThread = null; CurrThread.NextMutexThread = null;
if (OwnerThread != null) if (OwnerThread != null)
@ -214,6 +223,7 @@ namespace Ryujinx.Core.OsHle.Kernel
return false; return false;
} }
} }
}
private bool CondVarWait( private bool CondVarWait(
KThread WaitThread, KThread WaitThread,
@ -246,6 +256,8 @@ namespace Ryujinx.Core.OsHle.Kernel
DoInsert &= CurrThread != WaitThread; DoInsert &= CurrThread != WaitThread;
} }
//Only insert if the node doesn't already exist in the list.
//This prevents circular references.
if (DoInsert) if (DoInsert)
{ {
if (WaitThread.NextCondVarThread != null) if (WaitThread.NextCondVarThread != null)