Remove emulation of FD_CLOEXEC/O_NONBLOCK #907
Merged
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
asomers
requested changes
Jun 1, 2018
src/sys/socket/mod.rs
Outdated
| // little easier to understand by separating it out. So we have to merge these bitfields | ||
| // here. | ||
| let mut ty = ty as c_int; | ||
| ty |= flags.bits(); | ||
|
|
||
| // TODO: Check the kernel version |
src/sys/socket/mod.rs
Outdated
| @@ -810,45 +766,9 @@ pub fn accept(sockfd: RawFd) -> Result<RawFd> { | |||
| /// | |||
| /// [Further reading](http://man7.org/linux/man-pages/man2/accept.2.html) | |||
| pub fn accept4(sockfd: RawFd, flags: SockFlag) -> Result<RawFd> { | |||
There was a problem hiding this comment.
Looks like OSX lacks accept4, and NetBSD only has it on the unstable development version. So you should gate this function.
Rather than using the native implementation of these constants on supported platforms, the native implementation was instead emulated. This was also hidden from the user even though this could result in data races and the functionality being broken. Native functionality is, however, not support on macos/ios. Rather than enable this emulation solely for this platform, it should be removed as this is a dangerous abstraction.
|
@asomers should be good here I think. |
bors bot
added a commit
that referenced
this pull request
Jun 2, 2018
907: Remove emulation of FD_CLOEXEC/O_NONBLOCK r=asomers a=Susurrus Rather than using the native implementation of these constants on supported platforms, the native implementation was instead emulated. This was also hidden from the user even though this could result in data races and the functionality being broken. Native functionality is, however, not support on macos/ios. Rather than enable this emulation solely for this platform, it should be removed as this is a dangerous abstraction. This is a replacement for #863. There is much previous discussion there which I recommend you read to familiarize yourself with this decision. I'm looking to push this through rather quickly as it's the last thing blocking our next 0.11.0 release. cc @aomser @kristate Co-authored-by: Bryant Mairs <[email protected]>
|
@Susurrus You seem to be using my test cases from #863 in this commit [ref], but I am curious why you did not add me as a committer to this commit/patch? |
|
Sorry, you're right! I meant to just run them through the tests before merging them, but I should have talked to you before doing it at all. I'm really sorry about that! How would you like to handle this? I'd be happy to remove the test cases and you could file an additional PR with just those test cases so we can get it logged in git history that they're your work. |
Merged
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.
Rather than using the native implementation of these constants
on supported platforms, the native implementation was instead
emulated. This was also hidden from the user even though this
could result in data races and the functionality being broken.
Native functionality is, however, not support on macos/ios.
Rather than enable this emulation solely for this platform, it
should be removed as this is a dangerous abstraction.
This is a replacement for #863. There is much previous discussion there which I recommend you read to familiarize yourself with this decision.
I'm looking to push this through rather quickly as it's the last thing blocking our next 0.11.0 release.
cc @aomser @kristate