gh-85972: Use native timeout for inet socket operations #110988
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
aisk
changed the title
This reverts commit 6c0159f.
erlend-aasland
changed the title
zooba
reviewed
Jan 8, 2024
| @@ -3421,6 +3540,13 @@ internal_connect(PySocketSockObject *s, struct sockaddr *addr, int addrlen, | |||
|
|
|||
| /* save error, PyErr_CheckSignals() can replace it */ | |||
| err = GET_SOCK_ERROR; | |||
|
|
|||
| if (s->sock_timeout > 0) { | |||
| if (internal_setblocking(s, 1) < 0) { | |||
There was a problem hiding this comment.
Does this call not affect errno? And hence the following CHECK_ERRNO checks?
There was a problem hiding this comment.
Yes, I checked and found that it does. Updated to use the pre-stored errno to avoid this.
aisk
commented
Jan 13, 2024
Co-authored-by: Steve Dower <steve.dower@microsoft.com>
Co-authored-by: Steve Dower <steve.dower@microsoft.com>
|
Thanks for the review! I added some note on the first comment of this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I have a dig into using
SO_SENDTIMEOandSO_RECVTIMEOto implement the timeout operation, and found that most platforms support using them to set thewrite/send/read/recv... timeouts for INET sockets.For Unix domain sockets, only Linux supports using these options to set the timeout.
For
connect/accept,SO_SENDTIMEOandSO_RECVTIMEOalso affect these two operations' timeout on Linux.So, in this PR, Unix domain sockets will keep the old behavior (use setblocking(0) and select to emulate timeout).
For INET sockets,
socket.settimeoutwill useSO_SENDTIMEOandSO_RECVTIMEOoptions to set the timeout to the socket directly and use this to enforce a timeout.For INET sockets,
connectwill use the old behavior (use setblocking(0) and select to emulate timeout) to enforce a timeout. To achieve this, we should set it to non-blocking mode and call the oldconnect, then set it to blocking mode again.