@@ -2720,6 +2720,10 @@ pub struct ChannelManager<
27202720 /// A simple atomic flag to ensure only one task at a time can be processing events asynchronously.
27212721 pending_events_processor: AtomicBool,
27222722
2723+ /// A simple atomic flag to ensure only one task at a time can be processing HTLC forwards via
2724+ /// [`Self::process_pending_htlc_forwards`].
2725+ pending_htlc_forwards_processor: AtomicBool,
2726+
27232727 /// If we are running during init (either directly during the deserialization method or in
27242728 /// block connection methods which run after deserialization but before normal operation) we
27252729 /// cannot provide the user with [`ChannelMonitorUpdate`]s through the normal update flow -
@@ -3796,6 +3800,7 @@ where
37963800
37973801 pending_events: Mutex::new(VecDeque::new()),
37983802 pending_events_processor: AtomicBool::new(false),
3803+ pending_htlc_forwards_processor: AtomicBool::new(false),
37993804 pending_background_events: Mutex::new(Vec::new()),
38003805 total_consistency_lock: RwLock::new(()),
38013806 background_events_processed_since_startup: AtomicBool::new(false),
@@ -6329,9 +6334,19 @@ where
63296334 /// Users implementing their own background processing logic should call this in irregular,
63306335 /// randomly-distributed intervals.
63316336 pub fn process_pending_htlc_forwards(&self) {
6337+ if self
6338+ .pending_htlc_forwards_processor
6339+ .compare_exchange(false, true, Ordering::Acquire, Ordering::Relaxed)
6340+ .is_err()
6341+ {
6342+ return;
6343+ }
6344+
63326345 let _persistence_guard = PersistenceNotifierGuard::optionally_notify(self, || {
63336346 self.internal_process_pending_htlc_forwards()
63346347 });
6348+
6349+ self.pending_htlc_forwards_processor.store(false, Ordering::Release);
63356350 }
63366351
63376352 // Returns whether or not we need to re-persist.
@@ -16462,6 +16477,7 @@ where
1646216477
1646316478 pending_events: Mutex::new(pending_events_read),
1646416479 pending_events_processor: AtomicBool::new(false),
16480+ pending_htlc_forwards_processor: AtomicBool::new(false),
1646516481 pending_background_events: Mutex::new(pending_background_events),
1646616482 total_consistency_lock: RwLock::new(()),
1646716483 background_events_processed_since_startup: AtomicBool::new(false),
0 commit comments