From 9c0ca26e4afb55013fdfab780f7db7e8f2ce1180 Mon Sep 17 00:00:00 2001
From: Elias Rohrer <dev@tnull.de>
Date: Thu, 4 Dec 2025 09:40:23 +0100
Subject: [PATCH] Bias `Selector` to first poll the sleeper future

Previously, `lightning-background-processor`'s `Selector` would poll all
other futures *before* finally polling the sleeper and returning the
`exit` flag if it's ready. This could lead to scenarios where we
infinitely keep processing background events and never respect the
`exit` flag, as long as any of other futures keep being ready.

Here, we instead bias the `Selector` to always *first* poll the sleeper
future, and hence have us act on the `exit` flag immediately if is set.
---
 lightning-background-processor/src/lib.rs | 36 ++++++++++++-----------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index 19333c5823a..31e519b9f57 100644
--- a/lightning-background-processor/src/lib.rs
+++ b/lightning-background-processor/src/lib.rs
@@ -476,11 +476,11 @@ pub(crate) mod futures_util {
 	use core::pin::Pin;
 	use core::task::{Poll, RawWaker, RawWakerVTable, Waker};
 	pub(crate) struct Selector<
-		A: Future<Output = ()> + Unpin,
+		A: Future<Output = bool> + Unpin,
 		B: Future<Output = ()> + Unpin,
 		C: Future<Output = ()> + Unpin,
 		D: Future<Output = ()> + Unpin,
-		E: Future<Output = bool> + Unpin,
+		E: Future<Output = ()> + Unpin,
 	> {
 		pub a: A,
 		pub b: B,
@@ -490,28 +490,30 @@ pub(crate) mod futures_util {
 	}
 
 	pub(crate) enum SelectorOutput {
-		A,
+		A(bool),
 		B,
 		C,
 		D,
-		E(bool),
+		E,
 	}
 
 	impl<
-			A: Future<Output = ()> + Unpin,
+			A: Future<Output = bool> + Unpin,
 			B: Future<Output = ()> + Unpin,
 			C: Future<Output = ()> + Unpin,
 			D: Future<Output = ()> + Unpin,
-			E: Future<Output = bool> + Unpin,
+			E: Future<Output = ()> + Unpin,
 		> Future for Selector<A, B, C, D, E>
 	{
 		type Output = SelectorOutput;
 		fn poll(
 			mut self: Pin<&mut Self>, ctx: &mut core::task::Context<'_>,
 		) -> Poll<SelectorOutput> {
+			// Bias the selector so it first polls the sleeper future, allowing to exit immediately
+			// if the flag is set.
 			match Pin::new(&mut self.a).poll(ctx) {
-				Poll::Ready(()) => {
-					return Poll::Ready(SelectorOutput::A);
+				Poll::Ready(res) => {
+					return Poll::Ready(SelectorOutput::A(res));
 				},
 				Poll::Pending => {},
 			}
@@ -534,8 +536,8 @@ pub(crate) mod futures_util {
 				Poll::Pending => {},
 			}
 			match Pin::new(&mut self.e).poll(ctx) {
-				Poll::Ready(res) => {
-					return Poll::Ready(SelectorOutput::E(res));
+				Poll::Ready(()) => {
+					return Poll::Ready(SelectorOutput::E);
 				},
 				Poll::Pending => {},
 			}
@@ -1037,15 +1039,15 @@ where
 			(false, false) => FASTEST_TIMER,
 		};
 		let fut = Selector {
-			a: channel_manager.get_cm().get_event_or_persistence_needed_future(),
-			b: chain_monitor.get_update_future(),
-			c: om_fut,
-			d: lm_fut,
-			e: sleeper(sleep_delay),
+			a: sleeper(sleep_delay),
+			b: channel_manager.get_cm().get_event_or_persistence_needed_future(),
+			c: chain_monitor.get_update_future(),
+			d: om_fut,
+			e: lm_fut,
 		};
 		match fut.await {
-			SelectorOutput::A | SelectorOutput::B | SelectorOutput::C | SelectorOutput::D => {},
-			SelectorOutput::E(exit) => {
+			SelectorOutput::B | SelectorOutput::C | SelectorOutput::D | SelectorOutput::E => {},
+			SelectorOutput::A(exit) => {
 				if exit {
 					break;
 				}