manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-03-14 17:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename waitable to multiwait and add missing lock

Browse source
This commit is contained in:
gdk 2023-01-01 11:16:07 -03:00
parent 6aae859db9
commit fc0a1b4e85
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Ryujinx.Horizon/Sdk/OsTypes/Impl/MultiWaitImpl.cs
View file

@ -40,9 +40,9 @@ namespace Ryujinx.Horizon.Sdk.OsTypes.Impl
public void MoveAllFrom(MultiWaitImpl other)
{
foreach (MultiWaitHolderBase waitable in other._multiWaits)
foreach (MultiWaitHolderBase multiWait in other._multiWaits)
{
waitable.SetMultiWait(this);
multiWait.SetMultiWait(this);
}
_multiWaits.AddRange(other._multiWaits);
@ -128,9 +128,12 @@ namespace Ryujinx.Horizon.Sdk.OsTypes.Impl
}
break;
case WaitCancelled:
if (_signaledHolder != null)
lock (_lock)
{
return _signaledHolder;
if (_signaledHolder != null)
{
return _signaledHolder;
}
}
break;
default:

6
Ryujinx.Horizon/Sdk/Sf/Hipc/ServerManagerBase.cs
View file

@ -15,7 +15,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
private readonly MultiWait _multiWait;
private readonly MultiWait _waitList;
private readonly object _waitableSelectionLock;
private readonly object _multiWaitSelectionLock;
private readonly object _waitListLock;
private readonly Event _requestStopEvent;
@ -38,7 +38,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
_multiWait = new MultiWait();
_waitList = new MultiWait();
_waitableSelectionLock = new object();
_multiWaitSelectionLock = new object();
_waitListLock = new object();
_requestStopEvent = new Event(EventClearMode.ManualClear);
@ -136,7 +136,7 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
private MultiWaitHolder WaitSignaled()
{
lock (_waitableSelectionLock)
lock (_multiWaitSelectionLock)
{
while (true)
{