mirror
/
Riven
mirror of https://github.com/MingweiSamuel/Riven
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix: potential race condition in `Notified` `Drop` impl

val_queue
Mingwei Samuel 2024-03-26 21:09:37 -07:00
parent 053622efc5
commit 0d0fa4f2dc
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
riven/src/util/notify.rs
View File

@ -6,6 +6,8 @@ use futures::future::FusedFuture;
use futures::FutureExt; use futures::FutureExt;
use parking_lot::Mutex; use parking_lot::Mutex;
use slab::Slab; use slab::Slab;
#[cfg(feature = "tracing")]
use tracing as log;
#[derive(Default)] #[derive(Default)]
pub struct Notify { pub struct Notify {
@ -64,10 +66,10 @@ impl Notify {
// Ensure generation matches before removing, to prevent ABA problem. // Ensure generation matches before removing, to prevent ABA problem.
// If no match, means `Notify::notify_waiters` has already been called and deallocated us. // If no match, means `Notify::notify_waiters` has already been called and deallocated us.
if internal.generation == generation { if internal.generation == generation {
internal if internal.waiters.try_remove(key).is_none() {
.waiters // Rare race condition to get here, maybe?
.try_remove(key) log::trace!("Tried to de-register `Notified` on drop but corresponding waker not found.");
.expect("Expected to drop registered `Notified` but waker not found."); }
internal.waiters.shrink_to_fit(); internal.waiters.shrink_to_fit();
} }
} }