Skip to content

Commit

Permalink
use AtomicU64::fetch_update instead of handrolled RMW-loop
Browse files Browse the repository at this point in the history
  • Loading branch information
the8472 committed Sep 17, 2021
1 parent 2b512cc commit 57465d9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
1 change: 1 addition & 0 deletions library/std/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@
#![feature(atomic_mut_ptr)]
#![feature(auto_traits)]
#![feature(bench_black_box)]
#![feature(bool_to_option)]
#![feature(box_syntax)]
#![feature(c_unwind)]
#![feature(c_variadic)]
Expand Down
23 changes: 9 additions & 14 deletions library/std/src/time/monotonic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,15 @@ pub mod inner {
// This could be a problem for programs that call instants at intervals greater
// than 68 years. Interstellar probes may want to ensure that actually_monotonic() is true.
let packed = (secs << 32) | nanos;
let mut old = mono.load(Relaxed);
loop {
if old == UNINITIALIZED || packed.wrapping_sub(old) < u64::MAX / 2 {
match mono.compare_exchange_weak(old, packed, Relaxed, Relaxed) {
Ok(_) => return raw,
Err(x) => {
old = x;
continue;
}
}
} else {
let updated = mono.fetch_update(Relaxed, Relaxed, |old| {
(old == UNINITIALIZED || packed.wrapping_sub(old) < u64::MAX / 2).then_some(packed)
});
match updated {
Ok(_) => raw,
Err(newer) => {
// Backslide occurred. We reconstruct monotonized time from the upper 32 bit of the
// passed in value and the 64bits loaded from the atomic
let seconds_lower = old >> 32;
let seconds_lower = newer >> 32;
let mut seconds_upper = secs & 0xffff_ffff_0000_0000;
if secs & 0xffff_ffff > seconds_lower {
// Backslide caused the lower 32bit of the seconds part to wrap.
Expand All @@ -69,8 +64,8 @@ pub mod inner {
seconds_upper = seconds_upper.wrapping_add(0x1_0000_0000);
}
let secs = seconds_upper | seconds_lower;
let nanos = old as u32;
return ZERO.checked_add_duration(&Duration::new(secs, nanos)).unwrap();
let nanos = newer as u32;
ZERO.checked_add_duration(&Duration::new(secs, nanos)).unwrap()
}
}
}
Expand Down

0 comments on commit 57465d9

Please sign in to comment.