소스 검색

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

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.
Thog 6 년 전
부모
커밋
bce8972e7a
1개의 변경된 파일20개의 추가작업 그리고 6개의 파일을 삭제
  1. 20 6
      Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs

+ 20 - 6
Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs

@@ -1,11 +1,12 @@
-using Ryujinx.Common;
-using Ryujinx.Common.Logging;
+using Ryujinx.Common.Logging;
 using Ryujinx.HLE.Utilities;
+using System;
 using System.Buffers.Binary;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
+using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
 {
@@ -379,13 +380,26 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
                 }
             }
 
-            try
+            if (fdsCount != 0)
+            {
+                try
+                {
+                    System.Net.Sockets.Socket.Select(readEvents, writeEvents, errorEvents, timeout);
+                }
+                catch (SocketException exception)
+                {
+                    return WriteWinSock2Error(context, (WsaError)exception.ErrorCode);
+                }
+            }
+            else if (timeout == -1)
             {
-                System.Net.Sockets.Socket.Select(readEvents, writeEvents, errorEvents, timeout);
+                // 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();
             }
-            catch (SocketException exception)
+            else
             {
-                return WriteWinSock2Error(context, (WsaError)exception.ErrorCode);
+                // 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++)