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

Fix an endge case in bsd IClient::Poll implementation (#848)

Browse source 
This add some code to handle usage of poll without any fds.

This is required by Dark Souls Remastered main loop logic as it's
calling it without any fds during initialization.

===
General system stability improvements to enhance the user's experience.
This commit is contained in:
Thog 2019-12-22 20:33:59 +01:00 committed by jduncanator
parent bd010869a5
commit bce8972e7a
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs
View file

@ -1,11 +1,12 @@
using Ryujinx.Common; using Ryujinx.Common.Logging;
using Ryujinx.Common.Logging;
using Ryujinx.HLE.Utilities; using Ryujinx.HLE.Utilities;
using System;
using System.Buffers.Binary; using System.Buffers.Binary;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Text; using System.Text;
using System.Threading;
namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
{ {
@ -379,6 +380,8 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
} }
} }
if (fdsCount != 0)
{
try try
{ {
System.Net.Sockets.Socket.Select(readEvents, writeEvents, errorEvents, timeout); System.Net.Sockets.Socket.Select(readEvents, writeEvents, errorEvents, timeout);
@ -387,6 +390,17 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
{ {
return WriteWinSock2Error(context, (WsaError)exception.ErrorCode); return WriteWinSock2Error(context, (WsaError)exception.ErrorCode);
} }
}
else if (timeout == -1)
{
// FIXME: If we get a timeout of -1 and there is no fds to wait on, this should kill the KProces. (need to check that with re)
throw new InvalidOperationException();
}
else
{
// FIXME: We should make the KThread sleep but we can't do much about it yet.
Thread.Sleep(timeout);
}
for (int i = 0; i < fdsCount; i++) for (int i = 0; i < fdsCount; i++)
{ {