mirror/Riven
1
0
Fork 1
mirror of https://github.com/MingweiSamuel/Riven.git synced 2024-12-26 10:56:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: potential race condition in Notified Drop impl

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