Damjan Jovanovic : ws2_32: Only enable FD_WRITE on short sends.
Module: wine Branch: stable Commit: 65aa98826db11f5f8d648ecabff134e4995cb9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65aa98826db11f5f8d648ecabf... Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Sep 7 12:41:19 2008 +0200 ws2_32: Only enable FD_WRITE on short sends. (cherry picked from commit b904dd783cd2b7368e11882e37b90e7da23b73be) --- dlls/ws2_32/socket.c | 12 +++- dlls/ws2_32/tests/sock.c | 140 +++++++++++++++++++++++++++++++++------------ 2 files changed, 112 insertions(+), 40 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 989af4a..53514e7 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1250,8 +1250,13 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu if (result >= 0) { + int totalLength = 0; + int i; status = STATUS_SUCCESS; - _enable_event( wsa->hSocket, FD_WRITE, 0, 0 ); + for (i = 0; i < wsa->n_iovecs; i++) + totalLength += wsa->iovec[i].iov_len; + if (result < totalLength) + _enable_event( wsa->hSocket, FD_WRITE, 0, 0 ); } else { @@ -2667,6 +2672,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, unsigned int i, options; int n, fd, err; struct iovec iovec[WS_MSG_MAXIOVLEN]; + int totalLength = 0; ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; TRACE("socket %04lx, wsabuf %p, nbufs %d, flags %d, to %p, tolen %d, ovl %p, func %p\n", @@ -2694,6 +2700,7 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { iovec[i].iov_base = lpBuffers[i].buf; iovec[i].iov_len = lpBuffers[i].len; + totalLength += lpBuffers[i].len; } for (;;) @@ -2819,7 +2826,8 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } else /* non-blocking */ { - _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); + if (n < totalLength) + _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); if (n == -1) { err = WSAEWOULDBLOCK; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c2c56ae..d497b44 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1992,9 +1992,23 @@ static DWORD WINAPI drain_socket_thread(LPVOID arg) { char buffer[1024]; SOCKET sock = *(SOCKET*)arg; + int ret; - while (recv(sock, buffer, sizeof(buffer), 0) > 0) - ; + while ((ret = recv(sock, buffer, sizeof(buffer), 0)) != 0) + { + if (ret < 0) + { + if (WSAGetLastError() == WSAEWOULDBLOCK) + { + fd_set readset; + FD_ZERO(&readset); + FD_SET(sock, &readset); + select(0, &readset, NULL, NULL, NULL); + } + else + break; + } + } return 0; } @@ -2050,10 +2064,13 @@ static void test_write_events(void) SOCKET dst = INVALID_SOCKET; HANDLE hThread = NULL; HANDLE hEvent = INVALID_HANDLE_VALUE; - int len; + char *buffer = NULL; + int bufferSize = 1024*1024; u_long one = 1; int ret; DWORD id; + WSANETWORKEVENTS netEvents; + DWORD dwRet; if (tcp_socketpair(&src, &dst) != 0) { @@ -2061,6 +2078,29 @@ static void test_write_events(void) return; } + /* On Windows it seems when a non-blocking socket sends to a + blocking socket on the same host, the send() is BLOCKING, + so make both sockets non-blocking */ + ret = ioctlsocket(src, FIONBIO, &one); + if (ret) + { + ok(0, "ioctlsocket failed, error %d\n", WSAGetLastError()); + goto end; + } + ret = ioctlsocket(dst, FIONBIO, &one); + if (ret) + { + ok(0, "ioctlsocket failed, error %d\n", WSAGetLastError()); + goto end; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, bufferSize); + if (buffer == NULL) + { + ok(0, "could not allocate memory for test\n"); + goto end; + } + hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, &id); if (hThread == NULL) { @@ -2075,55 +2115,79 @@ static void test_write_events(void) goto end; } - ret = ioctlsocket(src, FIONBIO, &one); + ret = WSAEventSelect(src, hEvent, FD_WRITE | FD_CLOSE); if (ret) { - ok(0, "ioctlsocket failed, error %d\n", WSAGetLastError()); + ok(0, "WSAEventSelect failed, error %d\n", ret); goto end; } - ret = WSAEventSelect(src, hEvent, FD_WRITE | FD_CLOSE); + /* FD_WRITE should be set initially, and allow us to send at least 1 byte */ + dwRet = WaitForSingleObject(hEvent, 5000); + if (dwRet != WAIT_OBJECT_0) + { + ok(0, "Initial WaitForSingleObject failed, error %d\n", dwRet); + goto end; + } + ret = WSAEnumNetworkEvents(src, NULL, &netEvents); if (ret) { - ok(0, "WSAEventSelect failed, error %d\n", ret); + ok(0, "WSAEnumNetworkEvents failed, error %d\n", ret); + goto end; + } + if (netEvents.lNetworkEvents & FD_WRITE) + { + ret = send(src, "a", 1, 0); + ok(ret == 1, "sending 1 byte failed, error %d\n", WSAGetLastError()); + if (ret != 1) + goto end; + } + else + { + ok(0, "FD_WRITE not among initial events\n"); goto end; } - for (len = 100; len > 0; --len) + /* Now FD_WRITE should not be set, because the socket send buffer isn't full yet */ + dwRet = WaitForSingleObject(hEvent, 2000); + if (dwRet == WAIT_OBJECT_0) + { + ok(0, "WaitForSingleObject should have timed out, but succeeded!\n"); + goto end; + } + + /* Now if we send a tonne of data, the socket send buffer will only take some of it, + and we will get a short write, which will trigger another FD_WRITE event + as soon as data is sent and more space becomes available, but not any earlier. */ + do + { + ret = send(src, buffer, bufferSize, 0); + } while (ret == bufferSize); + if (ret >= 0 || WSAGetLastError() == WSAEWOULDBLOCK) { - WSANETWORKEVENTS netEvents; - DWORD dwRet = WaitForSingleObject(hEvent, 5000); - if (dwRet != WAIT_OBJECT_0) - { - ok(0, "WaitForSingleObject failed, error %d\n", dwRet); - goto end; - } - - ret = WSAEnumNetworkEvents(src, NULL, &netEvents); - if (ret) - { - ok(0, "WSAEnumNetworkEvents failed, error %d\n", ret); - goto end; - } - - if (netEvents.lNetworkEvents & FD_WRITE) - { - ret = send(src, "a", 1, 0); - if (ret < 0 && WSAGetLastError() != WSAEWOULDBLOCK) - { - ok(0, "send failed, error %d\n", WSAGetLastError()); - goto end; - } - } - - if (netEvents.lNetworkEvents & FD_CLOSE) - { - ok(0, "unexpected close\n"); - goto end; - } + dwRet = WaitForSingleObject(hEvent, 5000); + ok(dwRet == WAIT_OBJECT_0, "Waiting failed with %d\n", dwRet); + if (dwRet == WAIT_OBJECT_0) + { + ret = WSAEnumNetworkEvents(src, NULL, &netEvents); + ok(ret == 0, "WSAEnumNetworkEvents failed, error %d\n", ret); + if (ret == 0) + goto end; + ok(netEvents.lNetworkEvents & FD_WRITE, + "FD_WRITE event not set as expected, events are 0x%x\n", netEvents.lNetworkEvents); + } + else + goto end; + } + else + { + ok(0, "sending a lot of data failed with error %d\n", WSAGetLastError()); + goto end; } end: + if (buffer != NULL) + HeapFree(GetProcessHeap(), 0, buffer); if (src != INVALID_SOCKET) closesocket(src); if (dst != INVALID_SOCKET)
participants (1)
-
Alexandre Julliard