Specialize sleep_until implementation for unix (except mac) #141829
+410
−25
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
rustbot
added
O-hermit
|
r? @cuviper |
workingjubilee
changed the title
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
This can be done without touching all pal's, ill be doing that tomorrow, now its bed time 😴 edit: I was mistaken, tidy does not allow #[cfg(...)] in |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
RalfJung
reviewed
Jul 5, 2025
|
@rustbot author |
rustbot
added
S-waiting-on-author
|
Reminder, once the PR becomes ready for a review, use |
|
@rustbot ready Apologies for the unnecessary rebase. Changes:
|
rustbot
added
S-waiting-on-review
RalfJung
reviewed
Jul 5, 2025
This comment has been minimized.
This comment has been minimized.
RalfJung
reviewed
Jul 5, 2025
| fn add_100_millis(mut ts: libc::timespec) -> libc::timespec { | ||
| const SECOND: i64 = 1_000_000_000; | ||
| ts.tv_nsec += SECOND / 10; | ||
| ts.tv_sec = ts.tv_nsec / SECOND; |
There was a problem hiding this comment.
Isn't this still wrong?
Suggested change
| ts.tv_sec = ts.tv_nsec / SECOND; | |
| // If this pushes tv_nsec to SECOND or higher, we need to overflow to tv_sec. | |
| ts.tv_sec += ts.tv_nsec / SECOND; |
There was a problem hiding this comment.
It should be this now:
fn add_100_millis(mut ts: libc::timespec) -> libc::timespec {
const SECOND: i64 = 1_000_000_000;
ts.tv_nsec += SECOND / 10;
ts.tv_sec = ts.tv_nsec / SECOND;
ts.tv_nsec %= SECOND;
ts
}
There was a problem hiding this comment.
But that's wrong, as I already said above. Why do you reset tv_sec to 0 or 1??
There was a problem hiding this comment.
the overflow of tv_nsec is taken care of by:
ts.tv_nsec %= SECOND;right?
I tested it in the playground and there it seems to work https://play.rust-lang.org/?version=stable&mode=debug&edition=2024&gist=8c8dcb8b0f9c7238b747b61e073ddc14
There was a problem hiding this comment.
But that's wrong, as I already said above. Why do you reset
tv_secto 0 or 1??
oh damn I get it
There was a problem hiding this comment.
sorry I'm struggling with this, no idea why. Thanks for your patience Ralf.
There was a problem hiding this comment.
Better take a bit more time and think things through twice next time. :)
My suggestion above has a comment, I think that's still a useful comment to explain the (clearly non-obvious!) logic. Please add that comment.
|
Miri code looks good once the last comment nit is resolved. :) |
|
Regarding trying on more Unix platforms... this should cover various unix flavors |
rust-bors bot
added a commit
that referenced
this pull request
Jul 5, 2025
Specialize sleep_until implementation for unix (except mac) related tracking issue: #113752 Supersedes #118480 for the reasons see: #113752 (comment) Replaces the generic catch all implementation with target_os specific ones for: linux/netbsd/freebsd/android/solaris/illumos etc. Other platforms like wasi, macos/ios/tvos/watchos and windows will follow in later separate PR's (once this is merged). try-job: dist-x86_64-*
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
@rustbot author |
rustbot
added
S-waiting-on-author
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.
related tracking issue: #113752
Supersedes #118480 for the reasons see: #113752 (comment)
Replaces the generic catch all implementation with target_os specific ones for: linux/netbsd/freebsd/android/solaris/illumos etc. Other platforms like wasi, macos/ios/tvos/watchos and windows will follow in later separate PR's (once this is merged).