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

Avoid panics from Instant::elapsed #406

Merged
merged 1 commit into from Jul 31, 2021
Merged

Avoid panics from Instant::elapsed #406

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/histogram.rs
View file
Open in desktop
Expand Up @@ -517,7 +517,8 @@ impl Instant {

pub fn elapsed(&self) -> Duration {
match &*self {
Instant::Monotonic(i) => i.elapsed(),
// We use `saturating_duration_since` to avoid panics caused by non-monotonic clocks.
Instant::Monotonic(i) => StdInstant::now().saturating_duration_since(*i),

// It is different from `Instant::Monotonic`, the resolution here is millisecond.
// The processors in an SMP system do not start all at exactly the same time
Expand Down