Fix assert in poll_event_wait() on WSAENOTSOCK on Windows #3998
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
build |
Contributor
Author
|
@monojenkins build |
On Windows poll_event_wait() in threadpool-ms-io-poll.c checks WSAGetLastError() when mono_poll() fails. However, mono_poll() sets errno after converting the WSAXXX error code (e.g. WSAEFAULT->EFAULT). Occasionally (maybe 1 in 100) the System test suite fails due to mono_poll() returning an error and poll_event_wait() not handling the error code correctly on Windows. This patch changes poll_event_wait() to use the same code path which checks errno on all platforms including Windows. It also fixes a few other places which used to check WSAGetLastError() rather than errno after a call to mono_poll(). Also, the Socket.Poll_internal() and Socket.Select_internal() icalls had to be patched to convert back the errno value to a corresponding WSAXXX error code by adding WSABASEERR on Windows.
8d54a60 to
266345b
Compare
Contributor
Author
|
This patch only affects Windows. No builds look broken. I'm gonna merge it. |
ntherning
added a commit
to ntherning/mono
that referenced
this pull request
Nov 23, 2016
PR mono#3998 fixes an error handling issue in poll_event_wait(). This new change fixes a minor code style problem in that PR, the condition in a ternary wasn't enclosed in parentheses.
picenka21
pushed a commit
to picenka21/runtime
that referenced
this pull request
Feb 18, 2022
…vent_wait-on-WSAENOTSOCK-on-windows Fix assert in poll_event_wait() on WSAENOTSOCK on Windows Commit migrated from mono/mono@3592a79
picenka21
pushed a commit
to picenka21/runtime
that referenced
this pull request
Feb 18, 2022
PR mono/mono#3998 fixes an error handling issue in poll_event_wait(). This new change fixes a minor code style problem in that PR, the condition in a ternary wasn't enclosed in parentheses. Commit migrated from mono/mono@abc6614
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On Windows poll_event_wait() in threadpool-ms-io-poll.c checks
WSAGetLastError() when mono_poll() fails. However, mono_poll() sets errno
after converting the WSAXXX error code (e.g. WSAEFAULT->EFAULT). Occasionally
(maybe 1 in 100) the System test suite fails due to mono_poll() returning an
error and poll_event_wait() not handling the error code correctly on Windows.
This patch changes poll_event_wait() to use the same code path which checks
errno on all platforms including Windows. It also fixes a few other places
which used to check WSAGetLastError() rather than errno after a call to
mono_poll(). Also, the Socket.Poll_internal() and Socket.Select_internal()
icalls had to be patched to convert back the errno value to a corresponding
WSAXXX error code by adding WSABASEERR on Windows.