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

rt: enable task state assertions under loom (#2192)

Browse Source
This commit is contained in:
Jon Gjengset 2020-01-29 13:50:52 -05:00 committed by GitHub
parent 64e4bd1b2f
commit b70f1ce3c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tokio/src/task/state.rs
View File

@ -76,7 +76,7 @@ impl State {
const DELTA: usize = RUNNING | NOTIFIED; const DELTA: usize = RUNNING | NOTIFIED;
let prev = Snapshot(self.val.fetch_xor(DELTA, Acquire)); let prev = Snapshot(self.val.fetch_xor(DELTA, Acquire));
debug_assert!(prev.is_notified()); assert!(prev.is_notified());
if prev.is_running() { if prev.is_running() {
// We were signalled to cancel // We were signalled to cancel
@ -86,12 +86,12 @@ impl State {
return Snapshot(prev | CANCELLED); return Snapshot(prev | CANCELLED);
} }
debug_assert!(!prev.is_running()); assert!(!prev.is_running());
let next = Snapshot(prev.0 ^ DELTA); let next = Snapshot(prev.0 ^ DELTA);
debug_assert!(next.is_running()); assert!(next.is_running());
debug_assert!(!next.is_notified()); assert!(!next.is_notified());
next next
} }
@ -114,7 +114,7 @@ impl State {
let next = Snapshot(prev.0 ^ DELTA); let next = Snapshot(prev.0 ^ DELTA);
debug_assert!(!next.is_running()); assert!(!next.is_running());
next next
} }
@ -127,11 +127,11 @@ impl State {
let prev = Snapshot(self.val.fetch_xor(DELTA, AcqRel)); let prev = Snapshot(self.val.fetch_xor(DELTA, AcqRel));
debug_assert!(!prev.is_complete()); assert!(!prev.is_complete());
let next = Snapshot(prev.0 ^ DELTA); let next = Snapshot(prev.0 ^ DELTA);
debug_assert!(next.is_complete()); assert!(next.is_complete());
next next
} }
@ -144,15 +144,15 @@ impl State {
let prev = Snapshot(self.val.fetch_xor(DELTA, AcqRel)); let prev = Snapshot(self.val.fetch_xor(DELTA, AcqRel));
debug_assert!(prev.is_running()); assert!(prev.is_running());
debug_assert!(!prev.is_complete()); assert!(!prev.is_complete());
debug_assert!(!prev.is_released()); assert!(!prev.is_released());
let next = Snapshot(prev.0 ^ DELTA); let next = Snapshot(prev.0 ^ DELTA);
debug_assert!(!next.is_running()); assert!(!next.is_running());
debug_assert!(next.is_complete()); assert!(next.is_complete());
debug_assert!(next.is_released()); assert!(next.is_released());
next next
} }
@ -173,8 +173,8 @@ impl State {
pub(super) fn transition_to_canceled_from_queue(&self) -> Snapshot { pub(super) fn transition_to_canceled_from_queue(&self) -> Snapshot {
let prev = Snapshot(self.val.fetch_or(CANCELLED, AcqRel)); let prev = Snapshot(self.val.fetch_or(CANCELLED, AcqRel));
debug_assert!(!prev.is_complete()); assert!(!prev.is_complete());
debug_assert!(!prev.is_running() || prev.is_notified()); assert!(!prev.is_running() || prev.is_notified());
Snapshot(prev.0 | CANCELLED) Snapshot(prev.0 | CANCELLED)
} }
@ -223,12 +223,12 @@ impl State {
let prev = Snapshot(self.val.fetch_or(DELTA, Release)); let prev = Snapshot(self.val.fetch_or(DELTA, Release));
debug_assert!(!prev.is_released()); assert!(!prev.is_released());
debug_assert!(prev.is_terminal(), "state = {:?}", prev); assert!(prev.is_terminal(), "state = {:?}", prev);
let next = Snapshot(prev.0 | DELTA); let next = Snapshot(prev.0 | DELTA);
debug_assert!(next.is_released()); assert!(next.is_released());
if next.is_final_ref() || (next.has_join_waker() && !next.is_join_interested()) { if next.is_final_ref() || (next.has_join_waker() && !next.is_join_interested()) {
// The final reference to the task was dropped, the caller must free the // The final reference to the task was dropped, the caller must free the
@ -282,7 +282,7 @@ impl State {
let prev = Snapshot(self.val.fetch_sub(DELTA, Release)); let prev = Snapshot(self.val.fetch_sub(DELTA, Release));
debug_assert!(prev.is_join_interested()); assert!(prev.is_join_interested());
let next = Snapshot(prev.0 - DELTA); let next = Snapshot(prev.0 - DELTA);
@ -311,7 +311,7 @@ impl State {
return Err(Snapshot(prev)); return Err(Snapshot(prev));
} }
debug_assert!(prev & JOIN_INTEREST == JOIN_INTEREST); assert!(prev & JOIN_INTEREST == JOIN_INTEREST);
let next = (prev - JOIN_INTEREST) & !JOIN_WAKER; let next = (prev - JOIN_INTEREST) & !JOIN_WAKER;
@ -336,11 +336,11 @@ impl State {
let prev = Snapshot(self.val.fetch_xor(DELTA, Release)); let prev = Snapshot(self.val.fetch_xor(DELTA, Release));
debug_assert!(!prev.has_join_waker()); assert!(!prev.has_join_waker());
let next = Snapshot(prev.0 ^ DELTA); let next = Snapshot(prev.0 ^ DELTA);
debug_assert!(next.has_join_waker()); assert!(next.has_join_waker());
if next.is_complete() { if next.is_complete() {
atomic::fence(Acquire); atomic::fence(Acquire);
@ -360,7 +360,7 @@ impl State {
return Snapshot(prev); return Snapshot(prev);
} }
debug_assert!(Snapshot(prev).has_join_waker()); assert!(Snapshot(prev).has_join_waker());
let next = prev - JOIN_WAKER; let next = prev - JOIN_WAKER;