diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2023-08-26 18:59:58 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2023-08-27 15:40:22 +0300 |
| commit | a841911ea45272b1333134aa0d8bd9b3860a2c7f (patch) | |
| tree | aeca8ca004d3c25b766c147645ea301f44394621 /winsup | |
| parent | 384e572f41d0848f281a68dade2f02005fde50bd (diff) | |
Revert "Cygwin: select: workaround FD_WRITE network event handling"
This reverts commit dedbbd74d0a8f3b7dfae6188321703a47bb8a2b3.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/autoload.cc | 1 | ||||
| -rw-r--r-- | winsup/cygwin/select.cc | 30 |
2 files changed, 3 insertions, 28 deletions
diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc index 67149f828..c9ad92530 100644 --- a/winsup/cygwin/autoload.cc +++ b/winsup/cygwin/autoload.cc @@ -645,7 +645,6 @@ LoadDLLfunc (getsockname, ws2_32) LoadDLLfunc (getsockopt, ws2_32) LoadDLLfunc (ioctlsocket, ws2_32) LoadDLLfunc (listen, ws2_32) -LoadDLLfunc_pfx_only (select, ws2_32) LoadDLLfunc (setsockopt, ws2_32) LoadDLLfunc (shutdown, ws2_32) LoadDLLfunc (socket, ws2_32) diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index 7b9473849..bad4c37f3 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc @@ -1757,15 +1757,6 @@ fhandler_base::select_except (select_stuff *ss) return s; } -struct wfd_set -{ - u_int fd_count; - SOCKET fd_array[1]; -}; - -/* autoload exposes the Winsock select function only with a _win32_ prefix. */ -extern "C" int _win32_select(int, wfd_set *, wfd_set *, wfd_set *, TIMEVAL *); - static int peek_socket (select_record *me, bool) { @@ -1781,24 +1772,9 @@ peek_socket (select_record *me, bool) if (me->read_selected) me->read_ready |= ret || !!(events & (FD_READ | FD_ACCEPT | FD_CLOSE)); if (me->write_selected) - { - /* The FD_WRITE event is a false friend. It indicates ready to write - even if the next send fails with WSAEWOULDBLOCK. *After* the fact, - FD_WRITE will be cleared until sending is again possible. - For the time being, workaround that here by using the WinSock - select function. It indicates writability correctly. */ - if (events & FD_WRITE) - { - wfd_set w = { 1, { fh->get_socket () } }; - TIMEVAL t = { 0 }; - - if (_win32_select (0, NULL, &w, NULL, &t) == 0) - events &= ~FD_WRITE; - } - /* Don't check for FD_CLOSE here. Only an error case (ret == -1) - will set ready for writing. */ - me->write_ready |= ret || !!(events & (FD_WRITE | FD_CONNECT)); - } + /* Don't check for FD_CLOSE here. Only an error case (ret == -1) + will set ready for writing. */ + me->write_ready |= ret || !!(events & (FD_WRITE | FD_CONNECT)); if (me->except_selected) me->except_ready |= !!(events & FD_OOB); |