Skip to content

Commit 783e255

Browse files
committed
Switch Simple*ChannelManager locks around Score to RwLock
This switches the locks used around `ProbabilisticScorer` in `Simple*ChannelManager` type aliases to `RwLock`.
1 parent 3e93f9a commit 783e255

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lightning-background-processor/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ use core::task;
501501
/// could setup `process_events_async` like this:
502502
/// ```
503503
/// # use lightning::io;
504-
/// # use std::sync::{Arc, Mutex};
504+
/// # use std::sync::{Arc, RwLock};
505505
/// # use std::sync::atomic::{AtomicBool, Ordering};
506506
/// # use lightning_background_processor::{process_events_async, GossipSync};
507507
/// # struct MyStore {}
@@ -532,7 +532,7 @@ use core::task;
532532
/// # type MyNetworkGraph = lightning::routing::gossip::NetworkGraph<Arc<MyLogger>>;
533533
/// # type MyGossipSync = lightning::routing::gossip::P2PGossipSync<Arc<MyNetworkGraph>, Arc<MyUtxoLookup>, Arc<MyLogger>>;
534534
/// # type MyChannelManager = lightning::ln::channelmanager::SimpleArcChannelManager<MyChainMonitor, MyBroadcaster, MyFeeEstimator, MyLogger>;
535-
/// # type MyScorer = Mutex<lightning::routing::scoring::ProbabilisticScorer<Arc<MyNetworkGraph>, Arc<MyLogger>>>;
535+
/// # type MyScorer = RwLock<lightning::routing::scoring::ProbabilisticScorer<Arc<MyNetworkGraph>, Arc<MyLogger>>>;
536536
///
537537
/// # async fn setup_background_processing(my_persister: Arc<MyStore>, my_event_handler: Arc<MyEventHandler>, my_chain_monitor: Arc<MyChainMonitor>, my_channel_manager: Arc<MyChannelManager>, my_gossip_sync: Arc<MyGossipSync>, my_logger: Arc<MyLogger>, my_scorer: Arc<MyScorer>, my_peer_manager: Arc<MyPeerManager>) {
538538
/// let background_persister = Arc::clone(&my_persister);

lightning/src/ln/channelmanager.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ pub type SimpleArcChannelManager<M, T, F, L> = ChannelManager<
803803
Arc<DefaultRouter<
804804
Arc<NetworkGraph<Arc<L>>>,
805805
Arc<L>,
806-
Arc<Mutex<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>,
806+
Arc<RwLock<ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>>>,
807807
ProbabilisticScoringFeeParameters,
808808
ProbabilisticScorer<Arc<NetworkGraph<Arc<L>>>, Arc<L>>,
809809
>>,
@@ -832,7 +832,7 @@ pub type SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, M, T, F, L> =
832832
&'e DefaultRouter<
833833
&'f NetworkGraph<&'g L>,
834834
&'g L,
835-
&'h Mutex<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>,
835+
&'h RwLock<ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>>,
836836
ProbabilisticScoringFeeParameters,
837837
ProbabilisticScorer<&'f NetworkGraph<&'g L>, &'g L>
838838
>,

0 commit comments

Comments
 (0)