itsscb/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2025-10-01 12:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

time: fix big time panic issue (#6612)

Browse Source
This commit is contained in:
Weijia Jiang 2024-06-04 15:45:35 +08:00 committed by GitHub
parent 14c17fc096
commit 75c953bd63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tokio/src/runtime/time/source.rs
View File

@ -22,9 +22,11 @@ impl TimeSource {
pub(crate) fn instant_to_tick(&self, t: Instant) -> u64 { pub(crate) fn instant_to_tick(&self, t: Instant) -> u64 {
// round up // round up
let dur: Duration = t.saturating_duration_since(self.start_time); let dur: Duration = t.saturating_duration_since(self.start_time);
let ms = dur.as_millis(); let ms = dur
.as_millis()
ms.try_into().unwrap_or(MAX_SAFE_MILLIS_DURATION) .try_into()
.unwrap_or(MAX_SAFE_MILLIS_DURATION);
ms.min(MAX_SAFE_MILLIS_DURATION)
} }
pub(crate) fn tick_to_duration(&self, t: u64) -> Duration { pub(crate) fn tick_to_duration(&self, t: u64) -> Duration {
@ -34,4 +36,10 @@ impl TimeSource {
pub(crate) fn now(&self, clock: &Clock) -> u64 { pub(crate) fn now(&self, clock: &Clock) -> u64 {
self.instant_to_tick(clock.now()) self.instant_to_tick(clock.now())
} }
#[cfg(test)]
#[allow(dead_code)]
pub(super) fn start_time(&self) -> Instant {
self.start_time
}
} }

14
tokio/src/runtime/time/tests/mod.rs
View File

@ -267,3 +267,17 @@ fn poll_process_levels_targeted() {
handle.process_at_time(0, 192); handle.process_at_time(0, 192);
handle.process_at_time(0, 192); handle.process_at_time(0, 192);
} }
#[test]
#[cfg(not(loom))]
fn instant_to_tick_max() {
use crate::runtime::time::entry::MAX_SAFE_MILLIS_DURATION;
let rt = rt(true);
let handle = rt.handle().inner.driver().time();
let start_time = handle.time_source.start_time();
let long_future = start_time + std::time::Duration::from_millis(MAX_SAFE_MILLIS_DURATION + 1);
assert!(handle.time_source.instant_to_tick(long_future) <= MAX_SAFE_MILLIS_DURATION);
}