Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-04 04:26:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSAFD] ** WIP ** Improve performance

Browse source 
- Allow APCs to be processed while waiting for blocking IO
- Remove SleepEx hacks
This commit is contained in:
Thamatip Chitpong 2024-06-24 13:50:18 +07:00
parent c7a7f0ecdc
commit a04521e0e0
4 changed files with 45 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
dll/win32/msafd/misc/dllmain.c
View file

@ -610,6 +610,21 @@ TranslateNtStatusError(NTSTATUS Status)
}
}
VOID
MsafdWaitForBlockingIo(
_In_ HANDLE hEvent,
_In_ DWORD dwMilliseconds)
{
DWORD Result;
for (;;)
{
Result = WaitForSingleObjectEx(hEvent, dwMilliseconds, TRUE);
if (Result != WAIT_IO_COMPLETION)
break;
}
}
/*
* FUNCTION: Closes an open socket
* ARGUMENTS:
@ -775,7 +790,7 @@ WSPCloseSocket(IN SOCKET Handle,
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IoStatusBlock.Status;
}
}
@ -943,7 +958,7 @@ WSPBind(SOCKET Handle,
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}
@ -1028,7 +1043,7 @@ WSPListen(SOCKET Handle,
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}
@ -1304,7 +1319,7 @@ WSPSelect(IN int nfds,
/* Wait for Completion */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}
@ -1389,9 +1404,6 @@ WSPSelect(IN int nfds,
HeapFree( GlobalHeap, 0, PollBuffer );
NtClose( SockEvent );
/* HACK: Allow APC to be processed */
SleepEx(0, TRUE);
if( lpErrno )
{
switch( IOSB.Status )
@ -1534,7 +1546,7 @@ WSPAccept(
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}
@ -1567,7 +1579,7 @@ WSPAccept(
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}
@ -1607,7 +1619,7 @@ WSPAccept(
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}
@ -1712,7 +1724,7 @@ WSPAccept(
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}
@ -1766,7 +1778,7 @@ WSPAccept(
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}
@ -1960,7 +1972,7 @@ WSPConnect(SOCKET Handle,
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB->Status;
}
@ -2018,7 +2030,7 @@ WSPConnect(SOCKET Handle,
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB->Status;
}
@ -2079,7 +2091,7 @@ WSPConnect(SOCKET Handle,
/* Wait for completion if blocking */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB->Status;
}
@ -2109,7 +2121,7 @@ WSPConnect(SOCKET Handle,
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB->Status;
}
}
@ -2228,7 +2240,7 @@ WSPShutdown(SOCKET Handle,
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}
@ -2308,7 +2320,7 @@ WSPGetSockName(IN SOCKET Handle,
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}
@ -2412,7 +2424,7 @@ WSPGetPeerName(IN SOCKET s,
/* Wait for return */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}
@ -3457,7 +3469,7 @@ GetSocketInformation(PSOCKET_INFORMATION Socket,
/* Wait for completion if not overlapped */
if (!Overlapped && Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB->Status;
}
@ -3597,7 +3609,7 @@ SetSocketInformation(PSOCKET_INFORMATION Socket,
/* Wait for completion if not overlapped */
if (!Overlapped && Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB->Status;
}
@ -3678,7 +3690,7 @@ int CreateContext(PSOCKET_INFORMATION Socket)
/* Wait for Completion */
if (Status == STATUS_PENDING)
{
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}

4
dll/win32/msafd/misc/event.c
View file

@ -106,7 +106,7 @@ WSPEventSelect(
/* Wait for return */
if (Status == STATUS_PENDING) {
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}
@ -181,7 +181,7 @@ WSPEnumNetworkEvents(
/* Wait for return */
if (Status == STATUS_PENDING) {
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB.Status;
}

8
dll/win32/msafd/misc/sndrcv.c
View file

@ -365,7 +365,7 @@ WSPRecv(SOCKET Handle,
{
/* It's up to the protocol to time out recv. We must wait
* until the protocol decides it's had enough. */
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB->Status;
}
@ -605,7 +605,7 @@ WSPRecvFrom(SOCKET Handle,
if (!lpOverlapped && Status == STATUS_PENDING)
{
/* FIXME: Shouldn't wait infinitely for receive... */
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB->Status;
}
@ -803,7 +803,7 @@ WSPSend(SOCKET Handle,
if (!lpOverlapped && Status == STATUS_PENDING)
{
/* FIXME: Shouldn't wait infinitely for send... */
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB->Status;
}
@ -1017,7 +1017,7 @@ WSPSendTo(SOCKET Handle,
if (!lpOverlapped && Status == STATUS_PENDING)
{
/* FIXME: Shouldn't wait infinitely for send... */
WaitForSingleObject(SockEvent, INFINITE);
MsafdWaitForBlockingIo(SockEvent, INFINITE);
Status = IOSB->Status;
}

5
dll/win32/msafd/msafd.h
View file

@ -592,4 +592,9 @@ MsafdReturnWithErrno(
}
}
VOID
MsafdWaitForBlockingIo(
_In_ HANDLE hEvent,
_In_ DWORD dwMilliseconds);
#endif /* __MSAFD_H */