totallyregularhuman/Ryujinx
1
0
Fork 0
forked from Mirror/Ryujinx
Code Pull requests Activity

bsd: improve socket poll

Browse source 
We should report errors even when not requested.

This also ensure we only clear the bits that were requested on the output.

Finally, this fix when input events is 0.
This commit is contained in:
Mary 2022-09-01 22:27:35 +02:00 committed by Mary-nyan
parent f3835dc78b
commit df99257d7f
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocketPollManager.cs
View file

@ -38,12 +38,13 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
{ {
ManagedSocket socket = (ManagedSocket)evnt.FileDescriptor; ManagedSocket socket = (ManagedSocket)evnt.FileDescriptor;
bool isValidEvent = false; bool isValidEvent = evnt.Data.InputEvents == 0;
errorEvents.Add(socket.Socket);
if ((evnt.Data.InputEvents & PollEventTypeMask.Input) != 0) if ((evnt.Data.InputEvents & PollEventTypeMask.Input) != 0)
{ {
readEvents.Add(socket.Socket); readEvents.Add(socket.Socket);
errorEvents.Add(socket.Socket);
isValidEvent = true; isValidEvent = true;
} }
@ -51,7 +52,6 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
if ((evnt.Data.InputEvents & PollEventTypeMask.UrgentInput) != 0) if ((evnt.Data.InputEvents & PollEventTypeMask.UrgentInput) != 0)
{ {
readEvents.Add(socket.Socket); readEvents.Add(socket.Socket);
errorEvents.Add(socket.Socket);
isValidEvent = true; isValidEvent = true;
} }
@ -59,14 +59,6 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
if ((evnt.Data.InputEvents & PollEventTypeMask.Output) != 0) if ((evnt.Data.InputEvents & PollEventTypeMask.Output) != 0)
{ {
writeEvents.Add(socket.Socket); writeEvents.Add(socket.Socket);
errorEvents.Add(socket.Socket);
isValidEvent = true;
}
if ((evnt.Data.InputEvents & PollEventTypeMask.Error) != 0)
{
errorEvents.Add(socket.Socket);
isValidEvent = true; isValidEvent = true;
} }
@ -93,7 +85,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
{ {
Socket socket = ((ManagedSocket)evnt.FileDescriptor).Socket; Socket socket = ((ManagedSocket)evnt.FileDescriptor).Socket;
PollEventTypeMask outputEvents = 0; PollEventTypeMask outputEvents = evnt.Data.OutputEvents & ~evnt.Data.InputEvents;
if (errorEvents.Contains(socket)) if (errorEvents.Contains(socket))
{ {