From f7819baa618c528f60e266874051563ecfe08207 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 17 Mar 2017 14:58:06 -0400 Subject: [PATCH] Fix WaitEventSetWait() to handle write-ready waits properly on Windows. Windows apparently will not detect socket write-ready events unless a preceding send attempt returned WSAEWOULDBLOCK. In many usage patterns that's satisfied by the caller of WaitEvenSetWait(), but not always. Apply the same solution that we already had in pgwin32_select(), namely to perform a dummy WSASend() call with len=0. This will return WSAEWOULDBLOCK if there's no buffer space (even though it could legitimately do nothing and report success, which makes me a bit nervous about this solution; but since it's been working fine in libpq, let's roll with it). In passing, improve the comments about this in pgwin32_select(), and remove duplicated code there. Back-patch to 9.6 where WaitEventSetWait() was introduced. We might need to back-patch something similar into predecessor code. But given the lack of complaints so far, it's not clear that the case ever gets exercised in the back branches, so I'm not going to expend effort on it right now. This should resolve recurring failures on buildfarm member bowerbird, which has been failing since 1e8a85009 went in. Diagnosis and patch by Petr Jelinek, cosmetic adjustments by me. Discussion: https://postgr.es/m/5b6a6d6d-fb45-0afb-2e95-5600063c3dbd@2ndquadrant.com --- src/backend/port/win32/socket.c | 28 ++++++++++++---------------- src/backend/storage/ipc/latch.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c index a6f9070761..f11d6e6eb8 100644 --- a/src/backend/port/win32/socket.c +++ b/src/backend/port/win32/socket.c @@ -523,11 +523,16 @@ pgwin32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, c FD_ZERO(&outwritefds); /* - * Write FDs are different in the way that it is only flagged by - * WSASelectEvent() if we have tried to write to them first. So try an - * empty write + * Windows does not guarantee to log an FD_WRITE network event indicating + * that more data can be sent unless the previous send() failed with + * WSAEWOULDBLOCK. While our caller might well have made such a call, we + * cannot assume that here. Therefore, if waiting for write-ready, force + * the issue by doing a dummy send(). If the dummy send() succeeds, + * assume that the socket is in fact write-ready, and return immediately. + * Also, if it fails with something other than WSAEWOULDBLOCK, return a + * write-ready indication to let our caller deal with the error condition. */ - if (writefds) + if (writefds != NULL) { for (i = 0; i < writefds->fd_count; i++) { @@ -539,20 +544,11 @@ pgwin32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, c buf.len = 0; r = WSASend(writefds->fd_array[i], &buf, 1, &sent, 0, NULL, NULL); - if (r == 0) /* Completed - means things are fine! */ + if (r == 0 || WSAGetLastError() != WSAEWOULDBLOCK) FD_SET(writefds->fd_array[i], &outwritefds); - - else - { /* Not completed */ - if (WSAGetLastError() != WSAEWOULDBLOCK) - - /* - * Not completed, and not just "would block", so an error - * occurred - */ - FD_SET(writefds->fd_array[i], &outwritefds); - } } + + /* If we found any write-ready sockets, just return them immediately */ if (outwritefds.fd_count > 0) { memcpy(writefds, &outwritefds, sizeof(fd_set)); diff --git a/src/backend/storage/ipc/latch.c b/src/backend/storage/ipc/latch.c index ea7f930866..47983704d7 100644 --- a/src/backend/storage/ipc/latch.c +++ b/src/backend/storage/ipc/latch.c @@ -1401,6 +1401,38 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout, WaitEventAdjustWin32(set, cur_event); cur_event->reset = false; } + + /* + * Windows does not guarantee to log an FD_WRITE network event + * indicating that more data can be sent unless the previous send() + * failed with WSAEWOULDBLOCK. While our caller might well have made + * such a call, we cannot assume that here. Therefore, if waiting for + * write-ready, force the issue by doing a dummy send(). If the dummy + * send() succeeds, assume that the socket is in fact write-ready, and + * return immediately. Also, if it fails with something other than + * WSAEWOULDBLOCK, return a write-ready indication to let our caller + * deal with the error condition. + */ + if (cur_event->events & WL_SOCKET_WRITEABLE) + { + char c; + WSABUF buf; + DWORD sent; + int r; + + buf.buf = &c; + buf.len = 0; + + r = WSASend(cur_event->fd, &buf, 1, &sent, 0, NULL, NULL); + if (r == 0 || WSAGetLastError() != WSAEWOULDBLOCK) + { + occurred_events->pos = cur_event->pos; + occurred_events->user_data = cur_event->user_data; + occurred_events->events = WL_SOCKET_WRITEABLE; + occurred_events->fd = cur_event->fd; + return 1; + } + } } /* -- 2.40.0