mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-27 14:04:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed internal overflow on subtraiton in elapsed and duration

Browse source
This commit is contained in:
Per Lindgren 2019-11-18 16:36:17 +01:00
parent 725d5e1aa9
commit dfab15ed78
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -5,6 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased] ## [Unreleased]
## v0.5.1 - 2019-11-18
- Fixed arithmetic wrapping bug in src/cyccntr.rs
elapsed and duration could cause an internal overflow trap
on subtraction in debug mode.
## v0.5.0 - 2019-11-14 ## v0.5.0 - 2019-11-14
### Added ### Added

6
src/cyccnt.rs
View file

@ -38,12 +38,14 @@ impl Instant {
/// Returns the amount of time elapsed since this instant was created. /// Returns the amount of time elapsed since this instant was created.
pub fn elapsed(&self) -> Duration { pub fn elapsed(&self) -> Duration {
Instant::now() - *self let diff = Instant::now().inner.wrapping_sub(self.inner);
assert!(diff >= 0, "instant now is earlier than self");
Duration { inner: diff as u32 }
} }
/// Returns the amount of time elapsed from another instant to this one. /// Returns the amount of time elapsed from another instant to this one.
pub fn duration_since(&self, earlier: Instant) -> Duration { pub fn duration_since(&self, earlier: Instant) -> Duration {
let diff = self.inner - earlier.inner; let diff = self.inner.wrapping_sub(earlier.inner);
assert!(diff >= 0, "second instant is later than self"); assert!(diff >= 0, "second instant is later than self");
Duration { inner: diff as u32 } Duration { inner: diff as u32 }
} }