Merge pull request #3978 from joostjager/remove-bg-macro-follow-up

Async background processor check_sleeper refactor

Author: TheBlueMatt

lightning-background-processor/src/lib.rs

@@ -832,8 +832,7 @@ where
 	let mut have_pruned = false;
 	let mut have_decayed_scorer = false;
 
-	let mut cur_batch_delay = batch_delay.get();
-	let mut last_forwards_processing_call = sleeper(cur_batch_delay);
+	let mut last_forwards_processing_call = sleeper(batch_delay.get());
 
 	loop {
 		channel_manager.get_cm().process_pending_events_async(async_event_handler).await;
@@ -854,11 +853,11 @@ where
 		// generally, and as a fallback place such blocking only immediately before
 		// persistence.
 		peer_manager.as_ref().process_events();
-		match check_sleeper(&mut last_forwards_processing_call) {
+		match check_and_reset_sleeper(&mut last_forwards_processing_call, || {
+			sleeper(batch_delay.next())
+		}) {
 			Some(false) => {
 				channel_manager.get_cm().process_pending_htlc_forwards();
-				cur_batch_delay = batch_delay.next();
-				last_forwards_processing_call = sleeper(cur_batch_delay);
 			},
 			Some(true) => break,
 			None => {},
@@ -906,19 +905,20 @@ where
 		}
 
 		let await_slow = if mobile_interruptable_platform {
-			match check_sleeper(&mut await_start.unwrap()) {
+			// Specify a zero new sleeper timeout because we won't use the new sleeper. It is re-initialized in the next
+			// loop iteration.
+			match check_and_reset_sleeper(&mut await_start.unwrap(), || sleeper(Duration::ZERO)) {
 				Some(true) => break,
 				Some(false) => true,
 				None => false,
 			}
 		} else {
 			false
 		};
-		match check_sleeper(&mut last_freshness_call) {
+		match check_and_reset_sleeper(&mut last_freshness_call, || sleeper(FRESHNESS_TIMER)) {
 			Some(false) => {
 				log_trace!(logger, "Calling ChannelManager's timer_tick_occurred");
 				channel_manager.get_cm().timer_tick_occurred();
-				last_freshness_call = sleeper(FRESHNESS_TIMER);
 			},
 			Some(true) => break,
 			None => {},
@@ -963,8 +963,13 @@ where
 		// pruning their network graph. We run once 60 seconds after startup before
 		// continuing our normal cadence. For RGS, since 60 seconds is likely too long,
 		// we prune after an initial sync completes.
+		let prune_timer = if gossip_sync.prunable_network_graph().is_some() {
+			NETWORK_PRUNE_TIMER
+		} else {
+			FIRST_NETWORK_PRUNE_TIMER
+		};
 		let prune_timer_elapsed = {
-			match check_sleeper(&mut last_prune_call) {
+			match check_and_reset_sleeper(&mut last_prune_call, || sleeper(prune_timer)) {
 				Some(false) => true,
 				Some(true) => break,
 				None => false,
@@ -1008,9 +1013,6 @@ where
 
 				have_pruned = true;
 			}
-			let prune_timer =
-				if have_pruned { NETWORK_PRUNE_TIMER } else { FIRST_NETWORK_PRUNE_TIMER };
-			last_prune_call = sleeper(prune_timer);
 		}
 		if !have_decayed_scorer {
 			if let Some(ref scorer) = scorer {
@@ -1021,7 +1023,9 @@ where
 			}
 			have_decayed_scorer = true;
 		}
-		match check_sleeper(&mut last_scorer_persist_call) {
+		match check_and_reset_sleeper(&mut last_scorer_persist_call, || {
+			sleeper(SCORER_PERSIST_TIMER)
+		}) {
 			Some(false) => {
 				if let Some(ref scorer) = scorer {
 					if let Some(duration_since_epoch) = fetch_time() {
@@ -1053,12 +1057,11 @@ where
 					// TODO: Once our MSRV is 1.68 we should be able to drop the Box
 					futures.set_c(Box::pin(fut));
 				}
-				last_scorer_persist_call = sleeper(SCORER_PERSIST_TIMER);
 			},
 			Some(true) => break,
 			None => {},
 		}
-		match check_sleeper(&mut last_sweeper_call) {
+		match check_and_reset_sleeper(&mut last_sweeper_call, || sleeper(SWEEPER_TIMER)) {
 			Some(false) => {
 				log_trace!(logger, "Regenerating sweeper spends if necessary");
 				if let Some(ref sweeper) = sweeper {
@@ -1071,7 +1074,6 @@ where
 					// TODO: Once our MSRV is 1.68 we should be able to drop the Box
 					futures.set_d(Box::pin(fut));
 				}
-				last_sweeper_call = sleeper(SWEEPER_TIMER);
 			},
 			Some(true) => break,
 			None => {},
@@ -1082,13 +1084,14 @@ where
 			res?;
 		}
 
-		match check_sleeper(&mut last_onion_message_handler_call) {
+		match check_and_reset_sleeper(&mut last_onion_message_handler_call, || {
+			sleeper(ONION_MESSAGE_HANDLER_TIMER)
+		}) {
 			Some(false) => {
 				if let Some(om) = &onion_messenger {
 					log_trace!(logger, "Calling OnionMessageHandler's timer_tick_occurred");
 					om.get_om().timer_tick_occurred();
 				}
-				last_onion_message_handler_call = sleeper(ONION_MESSAGE_HANDLER_TIMER);
 			},
 			Some(true) => break,
 			None => {},
@@ -1112,23 +1115,21 @@ where
 			peer_manager.as_ref().disconnect_all_peers();
 			last_ping_call = sleeper(PING_TIMER);
 		} else {
-			match check_sleeper(&mut last_ping_call) {
+			match check_and_reset_sleeper(&mut last_ping_call, || sleeper(PING_TIMER)) {
 				Some(false) => {
 					log_trace!(logger, "Calling PeerManager's timer_tick_occurred");
 					peer_manager.as_ref().timer_tick_occurred();
-					last_ping_call = sleeper(PING_TIMER);
 				},
 				Some(true) => break,
 				_ => {},
 			}
 		}
 
 		// Rebroadcast pending claims.
-		match check_sleeper(&mut last_rebroadcast_call) {
+		match check_and_reset_sleeper(&mut last_rebroadcast_call, || sleeper(REBROADCAST_TIMER)) {
 			Some(false) => {
 				log_trace!(logger, "Rebroadcasting monitor's pending claims");
 				chain_monitor.rebroadcast_pending_claims();
-				last_rebroadcast_call = sleeper(REBROADCAST_TIMER);
 			},
 			Some(true) => break,
 			None => {},
@@ -1170,13 +1171,18 @@ where
 	Ok(())
 }
 
-fn check_sleeper<SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin>(
-	fut: &mut SleepFuture,
+fn check_and_reset_sleeper<
+	SleepFuture: core::future::Future<Output = bool> + core::marker::Unpin,
+>(
+	fut: &mut SleepFuture, mut new_sleeper: impl FnMut() -> SleepFuture,
 ) -> Option<bool> {
 	let mut waker = dummy_waker();
 	let mut ctx = task::Context::from_waker(&mut waker);
-	match core::pin::Pin::new(fut).poll(&mut ctx) {
-		task::Poll::Ready(exit) => Some(exit),
+	match core::pin::Pin::new(&mut *fut).poll(&mut ctx) {
+		task::Poll::Ready(exit) => {
+			*fut = new_sleeper();
+			Some(exit)
+		},
 		task::Poll::Pending => None,
 	}
 }
@@ -1502,7 +1508,7 @@ impl BackgroundProcessor {
 							NETWORK_GRAPH_PERSISTENCE_KEY,
 							&network_graph.encode(),
 						) {
-							log_error!(logger, "Error: Failed to persist network graph, check your disk and permissions {}",e);
+							log_error!(logger, "Error: Failed to persist network graph, check your disk and permissions {}", e);
 						}
 						have_pruned = true;
 					}
@@ -1531,10 +1537,7 @@ impl BackgroundProcessor {
 							SCORER_PERSISTENCE_KEY,
 							&scorer.encode(),
 						) {
-							log_error!(logger,
-						"Error: Failed to persist scorer, check your disk and permissions {}",
-						e,
-					);
+							log_error!(logger, "Error: Failed to persist scorer, check your disk and permissions {}", e);
 						}
 					}
 					last_scorer_persist_call = Instant::now();