Skip to content

Fix (and test) Future creation after a Notifier was notified #1758

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
merged 1 commit into from
Oct 7, 2022
Merged

Fix (and test) Future creation after a Notifier was notified #1758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion lightning/src/util/wakers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ impl Notifier {
Future {
state: Arc::new(Mutex::new(FutureState {
callbacks: Vec::new(),
complete: false,
complete: true,
}))
}
} else if let Some(existing_state) = &lock.1 {
Expand Down Expand Up @@ -217,6 +217,20 @@ mod tests {
use core::future::Future as FutureTrait;
use core::task::{Context, Poll, RawWaker, RawWakerVTable, Waker};

#[test]
fn notifier_pre_notified_future() {
// Previously, if we generated a future after a `Notifier` had been notified, the future
// would never complete. This tests this behavior, ensuring the future instead completes
// immediately.
let notifier = Notifier::new();
notifier.notify();

let callback = Arc::new(AtomicBool::new(false));
let callback_ref = Arc::clone(&callback);
notifier.get_future().register_callback(Box::new(move || assert!(!callback_ref.fetch_or(true, Ordering::SeqCst))));
assert!(callback.load(Ordering::SeqCst));
}

#[cfg(feature = "std")]
#[test]
fn test_wait_timeout() {
Expand Down