Skip to content

m: Improve drop ergonomics of Ready #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
notgull merged 2 commits into from
Jan 18, 2023
Merged

m: Improve drop ergonomics of Ready #109

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90046cc
Improve drop ergonomics of Ready
notgull Jan 17, 2023
a1634d3
Mixed up PhantomData
notgull Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 10 additions & 22 deletions src/reactor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ impl Source {
dir,
ticks: None,
index: None,
_guard: None,
_capture: PhantomData,
}
}
}
Expand Down Expand Up @@ -566,7 +566,7 @@ struct Ready<H: Borrow<crate::Async<T>>, T> {
dir: usize,
ticks: Option<(usize, usize)>,
index: Option<usize>,
_guard: Option<RemoveOnDrop<H, T>>,
_capture: PhantomData<fn() -> T>,
}

impl<H: Borrow<crate::Async<T>>, T> Unpin for Ready<H, T> {}
Expand All @@ -580,7 +580,6 @@ impl<H: Borrow<crate::Async<T>> + Clone, T> Future for Ready<H, T> {
dir,
ticks,
index,
_guard,
..
} = &mut *self;

Expand All @@ -602,12 +601,6 @@ impl<H: Borrow<crate::Async<T>> + Clone, T> Future for Ready<H, T> {
Some(i) => i,
None => {
let i = state[*dir].wakers.insert(None);
*_guard = Some(RemoveOnDrop {
handle: handle.clone(),
dir: *dir,
key: i,
_marker: PhantomData,
});
*index = Some(i);
*ticks = Some((Reactor::get().ticker(), state[*dir].tick));
i
Expand All @@ -631,20 +624,15 @@ impl<H: Borrow<crate::Async<T>> + Clone, T> Future for Ready<H, T> {
}
}

/// Remove waker when dropped.
struct RemoveOnDrop<H: Borrow<crate::Async<T>>, T> {
handle: H,
dir: usize,
key: usize,
_marker: PhantomData<fn() -> T>,
}

impl<H: Borrow<crate::Async<T>>, T> Drop for RemoveOnDrop<H, T> {
impl<H: Borrow<crate::Async<T>>, T> Drop for Ready<H, T> {
fn drop(&mut self) {
let mut state = self.handle.borrow().source.state.lock().unwrap();
let wakers = &mut state[self.dir].wakers;
if wakers.contains(self.key) {
wakers.remove(self.key);
// Remove our waker when dropped.
if let Some(key) = self.index {
let mut state = self.handle.borrow().source.state.lock().unwrap();
let wakers = &mut state[self.dir].wakers;
if wakers.contains(key) {
wakers.remove(key);
}
}
}
}