Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't panic when Instant is not monotonic #4044

Merged
merged 2 commits into from
Aug 19, 2021
Merged

Don't panic when Instant is not monotonic #4044

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eec26c2
time: don't panic when Instant is not monotonic
Darksonn Aug 17, 2021
dac9be0
fix copy paste mistake
Darksonn Aug 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions tokio/src/time/driver/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,13 +288,21 @@ impl Handle {
self.process_at_time(now)
}

pub(self) fn process_at_time(&self, now: u64) {
pub(self) fn process_at_time(&self, mut now: u64) {
let mut waker_list: [Option<Waker>; 32] = Default::default();
let mut waker_idx = 0;

let mut lock = self.get().lock();

assert!(now >= lock.elapsed);
if now < lock.elapsed {
// Time went backwards! This normally shouldn't happen as the Rust language
// guarantees that an Instant is monotonic, but can happen when running
// Linux in a VM on a Windows host due to std incorrectly trusting the
// hardware clock to be monotonic.
//
// See <https://github.com/tokio-rs/tokio/issues/3619> for more information.
now = lock.elapsed;
}

while let Some(entry) = lock.wheel.poll(now) {
debug_assert!(unsafe { entry.is_pending() });
Expand Down