Cleanup epoll_create fallback #1594
Merged
Conversation
This file contains 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
Not required, Make handles this for us.
Now allows the fallback on all platforms, if we doing one why not all? Also properly closes the file descriptor if the fcntl call fails.
Noah-Kennedy
approved these changes
Jul 17, 2022
link2xt
reviewed
Jul 18, 2022
| // 21. But `EPOLL_CLOEXEC` is an alias for `O_CLOEXEC` on that platform, | ||
| // so we use it instead. | ||
| #[cfg(target_os = "android")] | ||
| let res = syscall!(syscall(libc::SYS_epoll_create1, libc::EPOLL_CLOEXEC)); |
There was a problem hiding this comment.
It was EPOLL_CLOEXEC on non-android and O_CLOEXEC fallback on android, but after this PR it's reversed. I think it should be O_CLOEXEC on this line and EPOLL_CLOEXEC above (for epoll_create1).
There was a problem hiding this comment.
You're right, created #1595.
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.
Now allows the fallback on all platforms, if we doing one why not all?
Also properly closes the file descriptor if the
fcntlcall fails.Follow up to #1590.