fix(bug): ns->us overflow handling - #1655
Open
HalFrgrd wants to merge 5 commits into
Open
Conversation
This was referenced Aug 9, 2026
HalFrgrd
added a commit
to HalFrgrd/flyline
that referenced
this pull request
Aug 9, 2026
The termina fix can be reverted after bytecodealliance/rustix#1655 is deployed.
HalFrgrd
marked this pull request as ready for review
August 16, 2026 14:31
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
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 ran into an odd bug on macos. If my code polls for just under 5s (say 4.999_999_123 seconds), I immediately receive an
EINVALerror.This is due to the rounding logic. With the current logic, we set
tv_usecto1_000_000when the nanosecond remainder is >= 999_999_001. This creates an invalidtimevalon macOS and the OS returnsEINVAL.tv_usec=1_000_000is considered invalid and instead we should increasetv_secby 1 and settv_usec=0.Solution
Checking if
tv_usec >= 1_000_000https://github.com/apple-oss-distributions/xnu/blob/f6217f891ac0bb64f3d375211650a4c1ff8ca1ea/bsd/kern/kern_time.c#L670XNU handling this issue in the same way that I propose: https://github.com/apple-oss-distributions/xnu/blob/f6217f891ac0bb64f3d375211650a4c1ff8ca1ea/bsd/sys/time.h#L175-L177
Linux kernel is more forgiving if you set usec to 1_000_000: https://github.com/torvalds/linux/blob/master/fs/select.c#L723-L725. So I could revert the changes here for linux code and only keep the macos fix. Please let me know what is best.
Reproducing
This is a small example that I have tested on macOS.
selectwith a timeout of999_999_123fails using rustix master but is fixed when using my branch.Testing
invalid_offset::invalid_offset_fadviselibrary test was failing on main. All othercargo test --features=all-apistests pass. Allcargo test --test event --features all-apistests pass.