emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Unlink server sessions from multi-wait when service stops processing requests (#7072)

Browse source
This commit is contained in:
gdkchan 2024-07-20 16:17:40 -03:00 committed by GitHub
parent 2cb80f37d4
commit ce09450743
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Ryujinx.Horizon/Sdk/OsTypes/Impl/MultiWaitImpl.cs
View file

@ -21,6 +21,8 @@ namespace Ryujinx.Horizon.Sdk.OsTypes.Impl
public long CurrentTime { get; private set; } public long CurrentTime { get; private set; }
public IEnumerable<MultiWaitHolderBase> MultiWaits => _multiWaits;
public MultiWaitImpl() public MultiWaitImpl()
{ {
_multiWaits = new List<MultiWaitHolderBase>(); _multiWaits = new List<MultiWaitHolderBase>();

3
src/Ryujinx.Horizon/Sdk/OsTypes/MultiWait.cs
View file

@ -1,4 +1,5 @@
using Ryujinx.Horizon.Sdk.OsTypes.Impl; using Ryujinx.Horizon.Sdk.OsTypes.Impl;
using System.Collections.Generic;
namespace Ryujinx.Horizon.Sdk.OsTypes namespace Ryujinx.Horizon.Sdk.OsTypes
{ {
@ -6,6 +7,8 @@ namespace Ryujinx.Horizon.Sdk.OsTypes
{ {
private readonly MultiWaitImpl _impl; private readonly MultiWaitImpl _impl;
public IEnumerable<MultiWaitHolderBase> MultiWaits => _impl.MultiWaits;
public MultiWait() public MultiWait()
{ {
_impl = new MultiWaitImpl(); _impl = new MultiWaitImpl();

13
src/Ryujinx.Horizon/Sdk/Sf/Hipc/ServerManagerBase.cs
View file

@ -3,6 +3,7 @@ using Ryujinx.Horizon.Sdk.OsTypes;
using Ryujinx.Horizon.Sdk.Sf.Cmif; using Ryujinx.Horizon.Sdk.Sf.Cmif;
using Ryujinx.Horizon.Sdk.Sm; using Ryujinx.Horizon.Sdk.Sm;
using System; using System;
using System.Linq;
namespace Ryujinx.Horizon.Sdk.Sf.Hipc namespace Ryujinx.Horizon.Sdk.Sf.Hipc
{ {
@ -116,6 +117,18 @@ namespace Ryujinx.Horizon.Sdk.Sf.Hipc
while (WaitAndProcessRequestsImpl()) while (WaitAndProcessRequestsImpl())
{ {
} }
// Unlink pending sessions, dispose expects them to be already unlinked.
ServerSession[] serverSessions = Enumerable.OfType<ServerSession>(_multiWait.MultiWaits).ToArray();
foreach (ServerSession serverSession in serverSessions)
{
if (serverSession.IsLinked)
{
serverSession.UnlinkFromMultiWaitHolder();
}
}
} }
public void WaitAndProcessRequests() public void WaitAndProcessRequests()