mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #121646 - ibraheemdev:patch-17, r=ChrisDenton

Browse Source 
Fix race between block initialization and receiver disconnection

Port of https://github.com/crossbeam-rs/crossbeam/pull/1084. Closes https://github.com/rust-lang/rust/issues/121582.
This commit is contained in:
bors 2024-02-26 19:46:01 +00:00
commit fc3800f657
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/std/src/sync/mpmc/list.rs
View File

@ -547,7 +547,7 @@ fn discard_all_messages(&self) {
} }
let mut head = self.head.index.load(Ordering::Acquire); let mut head = self.head.index.load(Ordering::Acquire);
let mut block = self.head.block.load(Ordering::Acquire); let mut block = self.head.block.swap(ptr::null_mut(), Ordering::AcqRel);
// If we're going to be dropping messages we need to synchronize with initialization // If we're going to be dropping messages we need to synchronize with initialization
if head >> SHIFT != tail >> SHIFT { if head >> SHIFT != tail >> SHIFT {
@ -588,8 +588,8 @@ fn discard_all_messages(&self) {
drop(Box::from_raw(block)); drop(Box::from_raw(block));
} }
} }
head &= !MARK_BIT; head &= !MARK_BIT;
self.head.block.store(ptr::null_mut(), Ordering::Release);
self.head.index.store(head, Ordering::Release); self.head.index.store(head, Ordering::Release);
} }