Skip to content

Add Tokio example to process_events_async docs - #2004

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example
Apr 24, 2023
Merged

Add Tokio example to process_events_async docs#2004
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example

Conversation

@tnull

@tnulltnull commented Feb 2, 2023

Copy link
Copy Markdown
Contributor

With this we add as simple usage example of process_events_async based on Tokio.

This currently doesn't compile due to #2003, hence tagged blocked and in draft for the time being.

@tnull
tnull marked this pull request as draft February 2, 2023 21:02
Comment threadlightning-background-processor/src/lib.rs Outdated
@codecov-commenter

codecov-commenter commented Feb 2, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage has no change and project coverage change: +0.75 🎉

Comparison is base (bc54441) 91.57% compared to head (610aa40) 92.33%.

❗ Current head 610aa40 differs from pull request most recent head feda5d3. Consider uploading reports for the commit feda5d3 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2004 +/- ##
==========================================
+ Coverage 91.57% 92.33% +0.75% 
==========================================
Files 104 104 Lines 51553 61120 +9567 Branches 51553 61120 +9567 ==========================================
+ Hits 47212 56434 +9222 - Misses 4341 4686 +345 
Impacted FilesCoverage Δ
lightning-background-processor/src/lib.rs77.10% <ø> (-6.47%)⬇️

... and 39 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 9079705 to 610aa40CompareApril 21, 2023 14:33
@tnull
tnull marked this pull request as ready for review April 21, 2023 14:33
@tnull

Copy link
Copy Markdown
ContributorAuthor

Rebased on main, should be ready-to-go as soon as #2199 lands.

G8XSU
G8XSU previously approved these changes Apr 21, 2023
@tnull

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt Given the async BP is usable now, should/can we still squeeze this in 115?

///
/// For example, in order to process background events in a [Tokio](https://tokio.rs/) task, you
/// could setup `process_events_async` like this:
/// ```ignore

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be able to remove the ignore now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mh, not exactly, the ignore is there so I don't have to create pages of mock object for the below list of objects (persister, event handler, chain monitor, channel manager, etc.) without the test failing.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Would it be possible to do something like this?

//! type TxBroadcaster = dyn lightning::chain::chaininterface::BroadcasterInterface + Send + Sync;
//! type FeeEstimator = dyn lightning::chain::chaininterface::FeeEstimator + Send + Sync;
//! type Logger = dyn lightning::util::logger::Logger + Send + Sync;
//! type NodeSigner = dyn lightning::chain::keysinterface::NodeSigner + Send + Sync;
//! type UtxoLookup = dyn lightning::routing::utxo::UtxoLookup + Send + Sync;
//! type ChainFilter = dyn lightning::chain::Filter + Send + Sync;
//! type DataPersister = dyn lightning::chain::chainmonitor::Persist<lightning::chain::keysinterface::InMemorySigner> + Send + Sync;
//! type ChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::chain::keysinterface::InMemorySigner, Arc<ChainFilter>, Arc<TxBroadcaster>, Arc<FeeEstimator>, Arc<Logger>, Arc<DataPersister>>;
//! type ChannelManager = Arc<lightning::ln::channelmanager::SimpleArcChannelManager<ChainMonitor, TxBroadcaster, FeeEstimator, Logger>>;
//! type PeerManager = Arc<lightning::ln::peer_handler::SimpleArcPeerManager<lightning_net_tokio::SocketDescriptor, ChainMonitor, TxBroadcaster, FeeEstimator, UtxoLookup, Logger>>;
//!
//! // Connect to node with pubkey their_node_id at addr:
//! async fn connect_to_node(peer_manager: PeerManager, chain_monitor: Arc<ChainMonitor>, channel_manager: ChannelManager, their_node_id: PublicKey, addr: SocketAddr) {
//! lightning_net_tokio::connect_outbound(peer_manager, their_node_id, addr).await;
//! loop {
//! let event_handler = |event: Event| {
//! // Handle the event!
//! };
//! channel_manager.await_persistable_update();
//! channel_manager.process_pending_events(&event_handler);
//! chain_monitor.process_pending_events(&event_handler);
//! }
//! }
i.e. define dyn objects, then have a method that takes them. You could prefix the type def lines with # so they don't show up in the docs.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turned out to be not as straight-forward, but now went ~this way with 1f60a63.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Sorry missed your comment, happy to squeeze this in if its ready to go, can you go ahead and squash the fixups?

Comment threadlightning-background-processor/src/lib.rs
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 1a92dc5 to dcbb0b3CompareApril 24, 2023 19:57
Comment threadlightning-background-processor/src/lib.rs Outdated
Comment threadlightning-background-processor/src/lib.rs Outdated
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from dcbb0b3 to bb4abdaCompareApril 24, 2023 20:23
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from bb4abda to feda5d3CompareApril 24, 2023 20:26
@tnull

Copy link
Copy Markdown
ContributorAuthor

Squashed with the fixups:

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index fa8a0ffa..7e4f4791 100644
--- a/lightning-background-processor/src/lib.rs+++ b/lightning-background-processor/src/lib.rs@@ -468,4 +468,5 @@ use core::task;
/// boolean indicating whether the background processing should exit. Once `sleeper` returns a
/// future which outputs `true`, the loop will exit and this function's future will complete.
+/// The `sleeper` future is free to return early after it has triggered the exit condition.
///
/// See [`BackgroundProcessor::start`] for information on which actions this handles.
@@ -514,5 +515,5 @@ use core::task;
/// # type MyScorer = Mutex<lightning::routing::scoring::ProbabilisticScorer<Arc<MyNetworkGraph>, Arc<MyLogger>>>;
///
-/// # fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {+/// # async fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {
/// let background_persister = Arc::clone(&my_persister);
/// let background_event_handler = Arc::clone(&my_event_handler);
@@ -525,15 +526,12 @@ use core::task;
///
/// // Setup the sleeper.
-/// let stop_background_processing = Arc::new(AtomicBool::new(false));-/// let stop_fut = Arc::clone(&stop_background_processing);+/// let (stop_sender, stop_receiver) = tokio::sync::watch::channel(());
///
/// let sleeper = move |d| {
-/// let stop = Arc::clone(&stop_fut);+/// let mut receiver = stop_receiver.clone();
/// Box::pin(async move {
-/// if stop.load(Ordering::Acquire) {-/// true-/// } else {-/// tokio::time::sleep(d).await;-/// false+/// tokio::select!{+/// _ = tokio::time::sleep(d) => false,+/// _ = receiver.changed() => true,
/// }
/// })
@@ -542,5 +540,5 @@ use core::task;
/// let mobile_interruptable_platform = false;
///
-/// tokio::spawn(async move {+/// let handle = tokio::spawn(async move {
/// process_events_async(
/// background_persister,
@@ -560,5 +558,6 @@ use core::task;
///
/// // Stop the background processing.
-/// stop_background_processing.store(true, Ordering::Relaxed);+/// stop_sender.send(()).unwrap();+/// handle.await.unwrap();
/// # }
///```

@TheBlueMattTheBlueMatt mentioned this pull request Apr 24, 2023
@TheBlueMatt
TheBlueMatt merged commit ec3aa49 into lightningdevkit:mainApr 24, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tnull@codecov-commenter@TheBlueMatt@G8XSU@valentinewallace
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add Tokio example to `process_events_async` docs by tnull · Pull Request #2004 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add Tokio example to process_events_async docs - #2004

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example
Apr 24, 2023
Merged

Add Tokio example to process_events_async docs#2004
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example

Conversation

@tnull

@tnulltnull commented Feb 2, 2023

Copy link
Copy Markdown
Contributor

With this we add as simple usage example of process_events_async based on Tokio.

This currently doesn't compile due to #2003, hence tagged blocked and in draft for the time being.

@tnull
tnull marked this pull request as draft February 2, 2023 21:02
Comment threadlightning-background-processor/src/lib.rs Outdated
@codecov-commenter

codecov-commenter commented Feb 2, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage has no change and project coverage change: +0.75 🎉

Comparison is base (bc54441) 91.57% compared to head (610aa40) 92.33%.

❗ Current head 610aa40 differs from pull request most recent head feda5d3. Consider uploading reports for the commit feda5d3 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2004 +/- ##
==========================================
+ Coverage 91.57% 92.33% +0.75% 
==========================================
Files 104 104 Lines 51553 61120 +9567 Branches 51553 61120 +9567 ==========================================
+ Hits 47212 56434 +9222 - Misses 4341 4686 +345 
Impacted FilesCoverage Δ
lightning-background-processor/src/lib.rs77.10% <ø> (-6.47%)⬇️

... and 39 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 9079705 to 610aa40CompareApril 21, 2023 14:33
@tnull
tnull marked this pull request as ready for review April 21, 2023 14:33
@tnull

Copy link
Copy Markdown
ContributorAuthor

Rebased on main, should be ready-to-go as soon as #2199 lands.

G8XSU
G8XSU previously approved these changes Apr 21, 2023
@tnull

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt Given the async BP is usable now, should/can we still squeeze this in 115?

///
/// For example, in order to process background events in a [Tokio](https://tokio.rs/) task, you
/// could setup `process_events_async` like this:
/// ```ignore

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be able to remove the ignore now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mh, not exactly, the ignore is there so I don't have to create pages of mock object for the below list of objects (persister, event handler, chain monitor, channel manager, etc.) without the test failing.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Would it be possible to do something like this?

//! type TxBroadcaster = dyn lightning::chain::chaininterface::BroadcasterInterface + Send + Sync;
//! type FeeEstimator = dyn lightning::chain::chaininterface::FeeEstimator + Send + Sync;
//! type Logger = dyn lightning::util::logger::Logger + Send + Sync;
//! type NodeSigner = dyn lightning::chain::keysinterface::NodeSigner + Send + Sync;
//! type UtxoLookup = dyn lightning::routing::utxo::UtxoLookup + Send + Sync;
//! type ChainFilter = dyn lightning::chain::Filter + Send + Sync;
//! type DataPersister = dyn lightning::chain::chainmonitor::Persist<lightning::chain::keysinterface::InMemorySigner> + Send + Sync;
//! type ChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::chain::keysinterface::InMemorySigner, Arc<ChainFilter>, Arc<TxBroadcaster>, Arc<FeeEstimator>, Arc<Logger>, Arc<DataPersister>>;
//! type ChannelManager = Arc<lightning::ln::channelmanager::SimpleArcChannelManager<ChainMonitor, TxBroadcaster, FeeEstimator, Logger>>;
//! type PeerManager = Arc<lightning::ln::peer_handler::SimpleArcPeerManager<lightning_net_tokio::SocketDescriptor, ChainMonitor, TxBroadcaster, FeeEstimator, UtxoLookup, Logger>>;
//!
//! // Connect to node with pubkey their_node_id at addr:
//! async fn connect_to_node(peer_manager: PeerManager, chain_monitor: Arc<ChainMonitor>, channel_manager: ChannelManager, their_node_id: PublicKey, addr: SocketAddr) {
//! lightning_net_tokio::connect_outbound(peer_manager, their_node_id, addr).await;
//! loop {
//! let event_handler = |event: Event| {
//! // Handle the event!
//! };
//! channel_manager.await_persistable_update();
//! channel_manager.process_pending_events(&event_handler);
//! chain_monitor.process_pending_events(&event_handler);
//! }
//! }
i.e. define dyn objects, then have a method that takes them. You could prefix the type def lines with # so they don't show up in the docs.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turned out to be not as straight-forward, but now went ~this way with 1f60a63.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Sorry missed your comment, happy to squeeze this in if its ready to go, can you go ahead and squash the fixups?

Comment threadlightning-background-processor/src/lib.rs
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 1a92dc5 to dcbb0b3CompareApril 24, 2023 19:57
Comment threadlightning-background-processor/src/lib.rs Outdated
Comment threadlightning-background-processor/src/lib.rs Outdated
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from dcbb0b3 to bb4abdaCompareApril 24, 2023 20:23
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from bb4abda to feda5d3CompareApril 24, 2023 20:26
@tnull

Copy link
Copy Markdown
ContributorAuthor

Squashed with the fixups:

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index fa8a0ffa..7e4f4791 100644
--- a/lightning-background-processor/src/lib.rs+++ b/lightning-background-processor/src/lib.rs@@ -468,4 +468,5 @@ use core::task;
/// boolean indicating whether the background processing should exit. Once `sleeper` returns a
/// future which outputs `true`, the loop will exit and this function's future will complete.
+/// The `sleeper` future is free to return early after it has triggered the exit condition.
///
/// See [`BackgroundProcessor::start`] for information on which actions this handles.
@@ -514,5 +515,5 @@ use core::task;
/// # type MyScorer = Mutex<lightning::routing::scoring::ProbabilisticScorer<Arc<MyNetworkGraph>, Arc<MyLogger>>>;
///
-/// # fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {+/// # async fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {
/// let background_persister = Arc::clone(&my_persister);
/// let background_event_handler = Arc::clone(&my_event_handler);
@@ -525,15 +526,12 @@ use core::task;
///
/// // Setup the sleeper.
-/// let stop_background_processing = Arc::new(AtomicBool::new(false));-/// let stop_fut = Arc::clone(&stop_background_processing);+/// let (stop_sender, stop_receiver) = tokio::sync::watch::channel(());
///
/// let sleeper = move |d| {
-/// let stop = Arc::clone(&stop_fut);+/// let mut receiver = stop_receiver.clone();
/// Box::pin(async move {
-/// if stop.load(Ordering::Acquire) {-/// true-/// } else {-/// tokio::time::sleep(d).await;-/// false+/// tokio::select!{+/// _ = tokio::time::sleep(d) => false,+/// _ = receiver.changed() => true,
/// }
/// })
@@ -542,5 +540,5 @@ use core::task;
/// let mobile_interruptable_platform = false;
///
-/// tokio::spawn(async move {+/// let handle = tokio::spawn(async move {
/// process_events_async(
/// background_persister,
@@ -560,5 +558,6 @@ use core::task;
///
/// // Stop the background processing.
-/// stop_background_processing.store(true, Ordering::Relaxed);+/// stop_sender.send(()).unwrap();+/// handle.await.unwrap();
/// # }
///```

@TheBlueMattTheBlueMatt mentioned this pull request Apr 24, 2023
@TheBlueMatt
TheBlueMatt merged commit ec3aa49 into lightningdevkit:mainApr 24, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tnull@codecov-commenter@TheBlueMatt@G8XSU@valentinewallace
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add Tokio example to `process_events_async` docs by tnull · Pull Request #2004 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add Tokio example to process_events_async docs - #2004

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example
Apr 24, 2023
Merged

Add Tokio example to process_events_async docs#2004
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example

Conversation

@tnull

@tnulltnull commented Feb 2, 2023

Copy link
Copy Markdown
Contributor

With this we add as simple usage example of process_events_async based on Tokio.

This currently doesn't compile due to #2003, hence tagged blocked and in draft for the time being.

@tnull
tnull marked this pull request as draft February 2, 2023 21:02
Comment threadlightning-background-processor/src/lib.rs Outdated
@codecov-commenter

codecov-commenter commented Feb 2, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage has no change and project coverage change: +0.75 🎉

Comparison is base (bc54441) 91.57% compared to head (610aa40) 92.33%.

❗ Current head 610aa40 differs from pull request most recent head feda5d3. Consider uploading reports for the commit feda5d3 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2004 +/- ##
==========================================
+ Coverage 91.57% 92.33% +0.75% 
==========================================
Files 104 104 Lines 51553 61120 +9567 Branches 51553 61120 +9567 ==========================================
+ Hits 47212 56434 +9222 - Misses 4341 4686 +345 
Impacted FilesCoverage Δ
lightning-background-processor/src/lib.rs77.10% <ø> (-6.47%)⬇️

... and 39 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 9079705 to 610aa40CompareApril 21, 2023 14:33
@tnull
tnull marked this pull request as ready for review April 21, 2023 14:33
@tnull

Copy link
Copy Markdown
ContributorAuthor

Rebased on main, should be ready-to-go as soon as #2199 lands.

G8XSU
G8XSU previously approved these changes Apr 21, 2023
@tnull

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt Given the async BP is usable now, should/can we still squeeze this in 115?

///
/// For example, in order to process background events in a [Tokio](https://tokio.rs/) task, you
/// could setup `process_events_async` like this:
/// ```ignore

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be able to remove the ignore now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mh, not exactly, the ignore is there so I don't have to create pages of mock object for the below list of objects (persister, event handler, chain monitor, channel manager, etc.) without the test failing.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Would it be possible to do something like this?

//! type TxBroadcaster = dyn lightning::chain::chaininterface::BroadcasterInterface + Send + Sync;
//! type FeeEstimator = dyn lightning::chain::chaininterface::FeeEstimator + Send + Sync;
//! type Logger = dyn lightning::util::logger::Logger + Send + Sync;
//! type NodeSigner = dyn lightning::chain::keysinterface::NodeSigner + Send + Sync;
//! type UtxoLookup = dyn lightning::routing::utxo::UtxoLookup + Send + Sync;
//! type ChainFilter = dyn lightning::chain::Filter + Send + Sync;
//! type DataPersister = dyn lightning::chain::chainmonitor::Persist<lightning::chain::keysinterface::InMemorySigner> + Send + Sync;
//! type ChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::chain::keysinterface::InMemorySigner, Arc<ChainFilter>, Arc<TxBroadcaster>, Arc<FeeEstimator>, Arc<Logger>, Arc<DataPersister>>;
//! type ChannelManager = Arc<lightning::ln::channelmanager::SimpleArcChannelManager<ChainMonitor, TxBroadcaster, FeeEstimator, Logger>>;
//! type PeerManager = Arc<lightning::ln::peer_handler::SimpleArcPeerManager<lightning_net_tokio::SocketDescriptor, ChainMonitor, TxBroadcaster, FeeEstimator, UtxoLookup, Logger>>;
//!
//! // Connect to node with pubkey their_node_id at addr:
//! async fn connect_to_node(peer_manager: PeerManager, chain_monitor: Arc<ChainMonitor>, channel_manager: ChannelManager, their_node_id: PublicKey, addr: SocketAddr) {
//! lightning_net_tokio::connect_outbound(peer_manager, their_node_id, addr).await;
//! loop {
//! let event_handler = |event: Event| {
//! // Handle the event!
//! };
//! channel_manager.await_persistable_update();
//! channel_manager.process_pending_events(&event_handler);
//! chain_monitor.process_pending_events(&event_handler);
//! }
//! }
i.e. define dyn objects, then have a method that takes them. You could prefix the type def lines with # so they don't show up in the docs.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turned out to be not as straight-forward, but now went ~this way with 1f60a63.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Sorry missed your comment, happy to squeeze this in if its ready to go, can you go ahead and squash the fixups?

Comment threadlightning-background-processor/src/lib.rs
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 1a92dc5 to dcbb0b3CompareApril 24, 2023 19:57
Comment threadlightning-background-processor/src/lib.rs Outdated
Comment threadlightning-background-processor/src/lib.rs Outdated
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from dcbb0b3 to bb4abdaCompareApril 24, 2023 20:23
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from bb4abda to feda5d3CompareApril 24, 2023 20:26
@tnull

Copy link
Copy Markdown
ContributorAuthor

Squashed with the fixups:

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index fa8a0ffa..7e4f4791 100644
--- a/lightning-background-processor/src/lib.rs+++ b/lightning-background-processor/src/lib.rs@@ -468,4 +468,5 @@ use core::task;
/// boolean indicating whether the background processing should exit. Once `sleeper` returns a
/// future which outputs `true`, the loop will exit and this function's future will complete.
+/// The `sleeper` future is free to return early after it has triggered the exit condition.
///
/// See [`BackgroundProcessor::start`] for information on which actions this handles.
@@ -514,5 +515,5 @@ use core::task;
/// # type MyScorer = Mutex<lightning::routing::scoring::ProbabilisticScorer<Arc<MyNetworkGraph>, Arc<MyLogger>>>;
///
-/// # fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {+/// # async fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {
/// let background_persister = Arc::clone(&my_persister);
/// let background_event_handler = Arc::clone(&my_event_handler);
@@ -525,15 +526,12 @@ use core::task;
///
/// // Setup the sleeper.
-/// let stop_background_processing = Arc::new(AtomicBool::new(false));-/// let stop_fut = Arc::clone(&stop_background_processing);+/// let (stop_sender, stop_receiver) = tokio::sync::watch::channel(());
///
/// let sleeper = move |d| {
-/// let stop = Arc::clone(&stop_fut);+/// let mut receiver = stop_receiver.clone();
/// Box::pin(async move {
-/// if stop.load(Ordering::Acquire) {-/// true-/// } else {-/// tokio::time::sleep(d).await;-/// false+/// tokio::select!{+/// _ = tokio::time::sleep(d) => false,+/// _ = receiver.changed() => true,
/// }
/// })
@@ -542,5 +540,5 @@ use core::task;
/// let mobile_interruptable_platform = false;
///
-/// tokio::spawn(async move {+/// let handle = tokio::spawn(async move {
/// process_events_async(
/// background_persister,
@@ -560,5 +558,6 @@ use core::task;
///
/// // Stop the background processing.
-/// stop_background_processing.store(true, Ordering::Relaxed);+/// stop_sender.send(()).unwrap();+/// handle.await.unwrap();
/// # }
///```

@TheBlueMattTheBlueMatt mentioned this pull request Apr 24, 2023
@TheBlueMatt
TheBlueMatt merged commit ec3aa49 into lightningdevkit:mainApr 24, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tnull@codecov-commenter@TheBlueMatt@G8XSU@valentinewallace
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add Tokio example to `process_events_async` docs by tnull · Pull Request #2004 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add Tokio example to process_events_async docs - #2004

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example
Apr 24, 2023
Merged

Add Tokio example to process_events_async docs#2004
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example

Conversation

@tnull

@tnulltnull commented Feb 2, 2023

Copy link
Copy Markdown
Contributor

With this we add as simple usage example of process_events_async based on Tokio.

This currently doesn't compile due to #2003, hence tagged blocked and in draft for the time being.

@tnull
tnull marked this pull request as draft February 2, 2023 21:02
Comment threadlightning-background-processor/src/lib.rs Outdated
@codecov-commenter

codecov-commenter commented Feb 2, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage has no change and project coverage change: +0.75 🎉

Comparison is base (bc54441) 91.57% compared to head (610aa40) 92.33%.

❗ Current head 610aa40 differs from pull request most recent head feda5d3. Consider uploading reports for the commit feda5d3 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2004 +/- ##
==========================================
+ Coverage 91.57% 92.33% +0.75% 
==========================================
Files 104 104 Lines 51553 61120 +9567 Branches 51553 61120 +9567 ==========================================
+ Hits 47212 56434 +9222 - Misses 4341 4686 +345 
Impacted FilesCoverage Δ
lightning-background-processor/src/lib.rs77.10% <ø> (-6.47%)⬇️

... and 39 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 9079705 to 610aa40CompareApril 21, 2023 14:33
@tnull
tnull marked this pull request as ready for review April 21, 2023 14:33
@tnull

Copy link
Copy Markdown
ContributorAuthor

Rebased on main, should be ready-to-go as soon as #2199 lands.

G8XSU
G8XSU previously approved these changes Apr 21, 2023
@tnull

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt Given the async BP is usable now, should/can we still squeeze this in 115?

///
/// For example, in order to process background events in a [Tokio](https://tokio.rs/) task, you
/// could setup `process_events_async` like this:
/// ```ignore

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be able to remove the ignore now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mh, not exactly, the ignore is there so I don't have to create pages of mock object for the below list of objects (persister, event handler, chain monitor, channel manager, etc.) without the test failing.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Would it be possible to do something like this?

//! type TxBroadcaster = dyn lightning::chain::chaininterface::BroadcasterInterface + Send + Sync;
//! type FeeEstimator = dyn lightning::chain::chaininterface::FeeEstimator + Send + Sync;
//! type Logger = dyn lightning::util::logger::Logger + Send + Sync;
//! type NodeSigner = dyn lightning::chain::keysinterface::NodeSigner + Send + Sync;
//! type UtxoLookup = dyn lightning::routing::utxo::UtxoLookup + Send + Sync;
//! type ChainFilter = dyn lightning::chain::Filter + Send + Sync;
//! type DataPersister = dyn lightning::chain::chainmonitor::Persist<lightning::chain::keysinterface::InMemorySigner> + Send + Sync;
//! type ChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::chain::keysinterface::InMemorySigner, Arc<ChainFilter>, Arc<TxBroadcaster>, Arc<FeeEstimator>, Arc<Logger>, Arc<DataPersister>>;
//! type ChannelManager = Arc<lightning::ln::channelmanager::SimpleArcChannelManager<ChainMonitor, TxBroadcaster, FeeEstimator, Logger>>;
//! type PeerManager = Arc<lightning::ln::peer_handler::SimpleArcPeerManager<lightning_net_tokio::SocketDescriptor, ChainMonitor, TxBroadcaster, FeeEstimator, UtxoLookup, Logger>>;
//!
//! // Connect to node with pubkey their_node_id at addr:
//! async fn connect_to_node(peer_manager: PeerManager, chain_monitor: Arc<ChainMonitor>, channel_manager: ChannelManager, their_node_id: PublicKey, addr: SocketAddr) {
//! lightning_net_tokio::connect_outbound(peer_manager, their_node_id, addr).await;
//! loop {
//! let event_handler = |event: Event| {
//! // Handle the event!
//! };
//! channel_manager.await_persistable_update();
//! channel_manager.process_pending_events(&event_handler);
//! chain_monitor.process_pending_events(&event_handler);
//! }
//! }
i.e. define dyn objects, then have a method that takes them. You could prefix the type def lines with # so they don't show up in the docs.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turned out to be not as straight-forward, but now went ~this way with 1f60a63.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Sorry missed your comment, happy to squeeze this in if its ready to go, can you go ahead and squash the fixups?

Comment threadlightning-background-processor/src/lib.rs
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 1a92dc5 to dcbb0b3CompareApril 24, 2023 19:57
Comment threadlightning-background-processor/src/lib.rs Outdated
Comment threadlightning-background-processor/src/lib.rs Outdated
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from dcbb0b3 to bb4abdaCompareApril 24, 2023 20:23
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from bb4abda to feda5d3CompareApril 24, 2023 20:26
@tnull

Copy link
Copy Markdown
ContributorAuthor

Squashed with the fixups:

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index fa8a0ffa..7e4f4791 100644
--- a/lightning-background-processor/src/lib.rs+++ b/lightning-background-processor/src/lib.rs@@ -468,4 +468,5 @@ use core::task;
/// boolean indicating whether the background processing should exit. Once `sleeper` returns a
/// future which outputs `true`, the loop will exit and this function's future will complete.
+/// The `sleeper` future is free to return early after it has triggered the exit condition.
///
/// See [`BackgroundProcessor::start`] for information on which actions this handles.
@@ -514,5 +515,5 @@ use core::task;
/// # type MyScorer = Mutex<lightning::routing::scoring::ProbabilisticScorer<Arc<MyNetworkGraph>, Arc<MyLogger>>>;
///
-/// # fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {+/// # async fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {
/// let background_persister = Arc::clone(&my_persister);
/// let background_event_handler = Arc::clone(&my_event_handler);
@@ -525,15 +526,12 @@ use core::task;
///
/// // Setup the sleeper.
-/// let stop_background_processing = Arc::new(AtomicBool::new(false));-/// let stop_fut = Arc::clone(&stop_background_processing);+/// let (stop_sender, stop_receiver) = tokio::sync::watch::channel(());
///
/// let sleeper = move |d| {
-/// let stop = Arc::clone(&stop_fut);+/// let mut receiver = stop_receiver.clone();
/// Box::pin(async move {
-/// if stop.load(Ordering::Acquire) {-/// true-/// } else {-/// tokio::time::sleep(d).await;-/// false+/// tokio::select!{+/// _ = tokio::time::sleep(d) => false,+/// _ = receiver.changed() => true,
/// }
/// })
@@ -542,5 +540,5 @@ use core::task;
/// let mobile_interruptable_platform = false;
///
-/// tokio::spawn(async move {+/// let handle = tokio::spawn(async move {
/// process_events_async(
/// background_persister,
@@ -560,5 +558,6 @@ use core::task;
///
/// // Stop the background processing.
-/// stop_background_processing.store(true, Ordering::Relaxed);+/// stop_sender.send(()).unwrap();+/// handle.await.unwrap();
/// # }
///```

@TheBlueMattTheBlueMatt mentioned this pull request Apr 24, 2023
@TheBlueMatt
TheBlueMatt merged commit ec3aa49 into lightningdevkit:mainApr 24, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tnull@codecov-commenter@TheBlueMatt@G8XSU@valentinewallace
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Add Tokio example to `process_events_async` docs by tnull · Pull Request #2004 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add Tokio example to process_events_async docs - #2004

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example
Apr 24, 2023
Merged

Add Tokio example to process_events_async docs#2004
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example

Conversation

@tnull

@tnulltnull commented Feb 2, 2023

Copy link
Copy Markdown
Contributor

With this we add as simple usage example of process_events_async based on Tokio.

This currently doesn't compile due to #2003, hence tagged blocked and in draft for the time being.

@tnull
tnull marked this pull request as draft February 2, 2023 21:02
Comment threadlightning-background-processor/src/lib.rs Outdated
@codecov-commenter

codecov-commenter commented Feb 2, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage has no change and project coverage change: +0.75 🎉

Comparison is base (bc54441) 91.57% compared to head (610aa40) 92.33%.

❗ Current head 610aa40 differs from pull request most recent head feda5d3. Consider uploading reports for the commit feda5d3 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2004 +/- ##
==========================================
+ Coverage 91.57% 92.33% +0.75% 
==========================================
Files 104 104 Lines 51553 61120 +9567 Branches 51553 61120 +9567 ==========================================
+ Hits 47212 56434 +9222 - Misses 4341 4686 +345 
Impacted FilesCoverage Δ
lightning-background-processor/src/lib.rs77.10% <ø> (-6.47%)⬇️

... and 39 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 9079705 to 610aa40CompareApril 21, 2023 14:33
@tnull
tnull marked this pull request as ready for review April 21, 2023 14:33
@tnull

Copy link
Copy Markdown
ContributorAuthor

Rebased on main, should be ready-to-go as soon as #2199 lands.

G8XSU
G8XSU previously approved these changes Apr 21, 2023
@tnull

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt Given the async BP is usable now, should/can we still squeeze this in 115?

///
/// For example, in order to process background events in a [Tokio](https://tokio.rs/) task, you
/// could setup `process_events_async` like this:
/// ```ignore

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be able to remove the ignore now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mh, not exactly, the ignore is there so I don't have to create pages of mock object for the below list of objects (persister, event handler, chain monitor, channel manager, etc.) without the test failing.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Would it be possible to do something like this?

//! type TxBroadcaster = dyn lightning::chain::chaininterface::BroadcasterInterface + Send + Sync;
//! type FeeEstimator = dyn lightning::chain::chaininterface::FeeEstimator + Send + Sync;
//! type Logger = dyn lightning::util::logger::Logger + Send + Sync;
//! type NodeSigner = dyn lightning::chain::keysinterface::NodeSigner + Send + Sync;
//! type UtxoLookup = dyn lightning::routing::utxo::UtxoLookup + Send + Sync;
//! type ChainFilter = dyn lightning::chain::Filter + Send + Sync;
//! type DataPersister = dyn lightning::chain::chainmonitor::Persist<lightning::chain::keysinterface::InMemorySigner> + Send + Sync;
//! type ChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::chain::keysinterface::InMemorySigner, Arc<ChainFilter>, Arc<TxBroadcaster>, Arc<FeeEstimator>, Arc<Logger>, Arc<DataPersister>>;
//! type ChannelManager = Arc<lightning::ln::channelmanager::SimpleArcChannelManager<ChainMonitor, TxBroadcaster, FeeEstimator, Logger>>;
//! type PeerManager = Arc<lightning::ln::peer_handler::SimpleArcPeerManager<lightning_net_tokio::SocketDescriptor, ChainMonitor, TxBroadcaster, FeeEstimator, UtxoLookup, Logger>>;
//!
//! // Connect to node with pubkey their_node_id at addr:
//! async fn connect_to_node(peer_manager: PeerManager, chain_monitor: Arc<ChainMonitor>, channel_manager: ChannelManager, their_node_id: PublicKey, addr: SocketAddr) {
//! lightning_net_tokio::connect_outbound(peer_manager, their_node_id, addr).await;
//! loop {
//! let event_handler = |event: Event| {
//! // Handle the event!
//! };
//! channel_manager.await_persistable_update();
//! channel_manager.process_pending_events(&event_handler);
//! chain_monitor.process_pending_events(&event_handler);
//! }
//! }
i.e. define dyn objects, then have a method that takes them. You could prefix the type def lines with # so they don't show up in the docs.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turned out to be not as straight-forward, but now went ~this way with 1f60a63.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Sorry missed your comment, happy to squeeze this in if its ready to go, can you go ahead and squash the fixups?

Comment threadlightning-background-processor/src/lib.rs
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 1a92dc5 to dcbb0b3CompareApril 24, 2023 19:57
Comment threadlightning-background-processor/src/lib.rs Outdated
Comment threadlightning-background-processor/src/lib.rs Outdated
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from dcbb0b3 to bb4abdaCompareApril 24, 2023 20:23
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from bb4abda to feda5d3CompareApril 24, 2023 20:26
@tnull

Copy link
Copy Markdown
ContributorAuthor

Squashed with the fixups:

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index fa8a0ffa..7e4f4791 100644
--- a/lightning-background-processor/src/lib.rs+++ b/lightning-background-processor/src/lib.rs@@ -468,4 +468,5 @@ use core::task;
/// boolean indicating whether the background processing should exit. Once `sleeper` returns a
/// future which outputs `true`, the loop will exit and this function's future will complete.
+/// The `sleeper` future is free to return early after it has triggered the exit condition.
///
/// See [`BackgroundProcessor::start`] for information on which actions this handles.
@@ -514,5 +515,5 @@ use core::task;
/// # type MyScorer = Mutex<lightning::routing::scoring::ProbabilisticScorer<Arc<MyNetworkGraph>, Arc<MyLogger>>>;
///
-/// # fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {+/// # async fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {
/// let background_persister = Arc::clone(&my_persister);
/// let background_event_handler = Arc::clone(&my_event_handler);
@@ -525,15 +526,12 @@ use core::task;
///
/// // Setup the sleeper.
-/// let stop_background_processing = Arc::new(AtomicBool::new(false));-/// let stop_fut = Arc::clone(&stop_background_processing);+/// let (stop_sender, stop_receiver) = tokio::sync::watch::channel(());
///
/// let sleeper = move |d| {
-/// let stop = Arc::clone(&stop_fut);+/// let mut receiver = stop_receiver.clone();
/// Box::pin(async move {
-/// if stop.load(Ordering::Acquire) {-/// true-/// } else {-/// tokio::time::sleep(d).await;-/// false+/// tokio::select!{+/// _ = tokio::time::sleep(d) => false,+/// _ = receiver.changed() => true,
/// }
/// })
@@ -542,5 +540,5 @@ use core::task;
/// let mobile_interruptable_platform = false;
///
-/// tokio::spawn(async move {+/// let handle = tokio::spawn(async move {
/// process_events_async(
/// background_persister,
@@ -560,5 +558,6 @@ use core::task;
///
/// // Stop the background processing.
-/// stop_background_processing.store(true, Ordering::Relaxed);+/// stop_sender.send(()).unwrap();+/// handle.await.unwrap();
/// # }
///```

@TheBlueMattTheBlueMatt mentioned this pull request Apr 24, 2023
@TheBlueMatt
TheBlueMatt merged commit ec3aa49 into lightningdevkit:mainApr 24, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tnull@codecov-commenter@TheBlueMatt@G8XSU@valentinewallace
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add Tokio example to `process_events_async` docs by tnull · Pull Request #2004 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add Tokio example to process_events_async docs - #2004

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example
Apr 24, 2023
Merged

Add Tokio example to process_events_async docs#2004
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example

Conversation

@tnull

@tnulltnull commented Feb 2, 2023

Copy link
Copy Markdown
Contributor

With this we add as simple usage example of process_events_async based on Tokio.

This currently doesn't compile due to #2003, hence tagged blocked and in draft for the time being.

@tnull
tnull marked this pull request as draft February 2, 2023 21:02
Comment threadlightning-background-processor/src/lib.rs Outdated
@codecov-commenter

codecov-commenter commented Feb 2, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage has no change and project coverage change: +0.75 🎉

Comparison is base (bc54441) 91.57% compared to head (610aa40) 92.33%.

❗ Current head 610aa40 differs from pull request most recent head feda5d3. Consider uploading reports for the commit feda5d3 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2004 +/- ##
==========================================
+ Coverage 91.57% 92.33% +0.75% 
==========================================
Files 104 104 Lines 51553 61120 +9567 Branches 51553 61120 +9567 ==========================================
+ Hits 47212 56434 +9222 - Misses 4341 4686 +345 
Impacted FilesCoverage Δ
lightning-background-processor/src/lib.rs77.10% <ø> (-6.47%)⬇️

... and 39 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 9079705 to 610aa40CompareApril 21, 2023 14:33
@tnull
tnull marked this pull request as ready for review April 21, 2023 14:33
@tnull

Copy link
Copy Markdown
ContributorAuthor

Rebased on main, should be ready-to-go as soon as #2199 lands.

G8XSU
G8XSU previously approved these changes Apr 21, 2023
@tnull

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt Given the async BP is usable now, should/can we still squeeze this in 115?

///
/// For example, in order to process background events in a [Tokio](https://tokio.rs/) task, you
/// could setup `process_events_async` like this:
/// ```ignore

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be able to remove the ignore now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mh, not exactly, the ignore is there so I don't have to create pages of mock object for the below list of objects (persister, event handler, chain monitor, channel manager, etc.) without the test failing.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Would it be possible to do something like this?

//! type TxBroadcaster = dyn lightning::chain::chaininterface::BroadcasterInterface + Send + Sync;
//! type FeeEstimator = dyn lightning::chain::chaininterface::FeeEstimator + Send + Sync;
//! type Logger = dyn lightning::util::logger::Logger + Send + Sync;
//! type NodeSigner = dyn lightning::chain::keysinterface::NodeSigner + Send + Sync;
//! type UtxoLookup = dyn lightning::routing::utxo::UtxoLookup + Send + Sync;
//! type ChainFilter = dyn lightning::chain::Filter + Send + Sync;
//! type DataPersister = dyn lightning::chain::chainmonitor::Persist<lightning::chain::keysinterface::InMemorySigner> + Send + Sync;
//! type ChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::chain::keysinterface::InMemorySigner, Arc<ChainFilter>, Arc<TxBroadcaster>, Arc<FeeEstimator>, Arc<Logger>, Arc<DataPersister>>;
//! type ChannelManager = Arc<lightning::ln::channelmanager::SimpleArcChannelManager<ChainMonitor, TxBroadcaster, FeeEstimator, Logger>>;
//! type PeerManager = Arc<lightning::ln::peer_handler::SimpleArcPeerManager<lightning_net_tokio::SocketDescriptor, ChainMonitor, TxBroadcaster, FeeEstimator, UtxoLookup, Logger>>;
//!
//! // Connect to node with pubkey their_node_id at addr:
//! async fn connect_to_node(peer_manager: PeerManager, chain_monitor: Arc<ChainMonitor>, channel_manager: ChannelManager, their_node_id: PublicKey, addr: SocketAddr) {
//! lightning_net_tokio::connect_outbound(peer_manager, their_node_id, addr).await;
//! loop {
//! let event_handler = |event: Event| {
//! // Handle the event!
//! };
//! channel_manager.await_persistable_update();
//! channel_manager.process_pending_events(&event_handler);
//! chain_monitor.process_pending_events(&event_handler);
//! }
//! }
i.e. define dyn objects, then have a method that takes them. You could prefix the type def lines with # so they don't show up in the docs.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turned out to be not as straight-forward, but now went ~this way with 1f60a63.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Sorry missed your comment, happy to squeeze this in if its ready to go, can you go ahead and squash the fixups?

Comment threadlightning-background-processor/src/lib.rs
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 1a92dc5 to dcbb0b3CompareApril 24, 2023 19:57
Comment threadlightning-background-processor/src/lib.rs Outdated
Comment threadlightning-background-processor/src/lib.rs Outdated
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from dcbb0b3 to bb4abdaCompareApril 24, 2023 20:23
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from bb4abda to feda5d3CompareApril 24, 2023 20:26
@tnull

Copy link
Copy Markdown
ContributorAuthor

Squashed with the fixups:

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index fa8a0ffa..7e4f4791 100644
--- a/lightning-background-processor/src/lib.rs+++ b/lightning-background-processor/src/lib.rs@@ -468,4 +468,5 @@ use core::task;
/// boolean indicating whether the background processing should exit. Once `sleeper` returns a
/// future which outputs `true`, the loop will exit and this function's future will complete.
+/// The `sleeper` future is free to return early after it has triggered the exit condition.
///
/// See [`BackgroundProcessor::start`] for information on which actions this handles.
@@ -514,5 +515,5 @@ use core::task;
/// # type MyScorer = Mutex<lightning::routing::scoring::ProbabilisticScorer<Arc<MyNetworkGraph>, Arc<MyLogger>>>;
///
-/// # fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {+/// # async fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {
/// let background_persister = Arc::clone(&my_persister);
/// let background_event_handler = Arc::clone(&my_event_handler);
@@ -525,15 +526,12 @@ use core::task;
///
/// // Setup the sleeper.
-/// let stop_background_processing = Arc::new(AtomicBool::new(false));-/// let stop_fut = Arc::clone(&stop_background_processing);+/// let (stop_sender, stop_receiver) = tokio::sync::watch::channel(());
///
/// let sleeper = move |d| {
-/// let stop = Arc::clone(&stop_fut);+/// let mut receiver = stop_receiver.clone();
/// Box::pin(async move {
-/// if stop.load(Ordering::Acquire) {-/// true-/// } else {-/// tokio::time::sleep(d).await;-/// false+/// tokio::select!{+/// _ = tokio::time::sleep(d) => false,+/// _ = receiver.changed() => true,
/// }
/// })
@@ -542,5 +540,5 @@ use core::task;
/// let mobile_interruptable_platform = false;
///
-/// tokio::spawn(async move {+/// let handle = tokio::spawn(async move {
/// process_events_async(
/// background_persister,
@@ -560,5 +558,6 @@ use core::task;
///
/// // Stop the background processing.
-/// stop_background_processing.store(true, Ordering::Relaxed);+/// stop_sender.send(()).unwrap();+/// handle.await.unwrap();
/// # }
///```

@TheBlueMattTheBlueMatt mentioned this pull request Apr 24, 2023
@TheBlueMatt
TheBlueMatt merged commit ec3aa49 into lightningdevkit:mainApr 24, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tnull@codecov-commenter@TheBlueMatt@G8XSU@valentinewallace
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add Tokio example to `process_events_async` docs by tnull · Pull Request #2004 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add Tokio example to process_events_async docs - #2004

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example
Apr 24, 2023
Merged

Add Tokio example to process_events_async docs#2004
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example

Conversation

@tnull

@tnulltnull commented Feb 2, 2023

Copy link
Copy Markdown
Contributor

With this we add as simple usage example of process_events_async based on Tokio.

This currently doesn't compile due to #2003, hence tagged blocked and in draft for the time being.

@tnull
tnull marked this pull request as draft February 2, 2023 21:02
Comment threadlightning-background-processor/src/lib.rs Outdated
@codecov-commenter

codecov-commenter commented Feb 2, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage has no change and project coverage change: +0.75 🎉

Comparison is base (bc54441) 91.57% compared to head (610aa40) 92.33%.

❗ Current head 610aa40 differs from pull request most recent head feda5d3. Consider uploading reports for the commit feda5d3 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2004 +/- ##
==========================================
+ Coverage 91.57% 92.33% +0.75% 
==========================================
Files 104 104 Lines 51553 61120 +9567 Branches 51553 61120 +9567 ==========================================
+ Hits 47212 56434 +9222 - Misses 4341 4686 +345 
Impacted FilesCoverage Δ
lightning-background-processor/src/lib.rs77.10% <ø> (-6.47%)⬇️

... and 39 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 9079705 to 610aa40CompareApril 21, 2023 14:33
@tnull
tnull marked this pull request as ready for review April 21, 2023 14:33
@tnull

Copy link
Copy Markdown
ContributorAuthor

Rebased on main, should be ready-to-go as soon as #2199 lands.

G8XSU
G8XSU previously approved these changes Apr 21, 2023
@tnull

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt Given the async BP is usable now, should/can we still squeeze this in 115?

///
/// For example, in order to process background events in a [Tokio](https://tokio.rs/) task, you
/// could setup `process_events_async` like this:
/// ```ignore

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be able to remove the ignore now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mh, not exactly, the ignore is there so I don't have to create pages of mock object for the below list of objects (persister, event handler, chain monitor, channel manager, etc.) without the test failing.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Would it be possible to do something like this?

//! type TxBroadcaster = dyn lightning::chain::chaininterface::BroadcasterInterface + Send + Sync;
//! type FeeEstimator = dyn lightning::chain::chaininterface::FeeEstimator + Send + Sync;
//! type Logger = dyn lightning::util::logger::Logger + Send + Sync;
//! type NodeSigner = dyn lightning::chain::keysinterface::NodeSigner + Send + Sync;
//! type UtxoLookup = dyn lightning::routing::utxo::UtxoLookup + Send + Sync;
//! type ChainFilter = dyn lightning::chain::Filter + Send + Sync;
//! type DataPersister = dyn lightning::chain::chainmonitor::Persist<lightning::chain::keysinterface::InMemorySigner> + Send + Sync;
//! type ChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::chain::keysinterface::InMemorySigner, Arc<ChainFilter>, Arc<TxBroadcaster>, Arc<FeeEstimator>, Arc<Logger>, Arc<DataPersister>>;
//! type ChannelManager = Arc<lightning::ln::channelmanager::SimpleArcChannelManager<ChainMonitor, TxBroadcaster, FeeEstimator, Logger>>;
//! type PeerManager = Arc<lightning::ln::peer_handler::SimpleArcPeerManager<lightning_net_tokio::SocketDescriptor, ChainMonitor, TxBroadcaster, FeeEstimator, UtxoLookup, Logger>>;
//!
//! // Connect to node with pubkey their_node_id at addr:
//! async fn connect_to_node(peer_manager: PeerManager, chain_monitor: Arc<ChainMonitor>, channel_manager: ChannelManager, their_node_id: PublicKey, addr: SocketAddr) {
//! lightning_net_tokio::connect_outbound(peer_manager, their_node_id, addr).await;
//! loop {
//! let event_handler = |event: Event| {
//! // Handle the event!
//! };
//! channel_manager.await_persistable_update();
//! channel_manager.process_pending_events(&event_handler);
//! chain_monitor.process_pending_events(&event_handler);
//! }
//! }
i.e. define dyn objects, then have a method that takes them. You could prefix the type def lines with # so they don't show up in the docs.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turned out to be not as straight-forward, but now went ~this way with 1f60a63.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Sorry missed your comment, happy to squeeze this in if its ready to go, can you go ahead and squash the fixups?

Comment threadlightning-background-processor/src/lib.rs
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 1a92dc5 to dcbb0b3CompareApril 24, 2023 19:57
Comment threadlightning-background-processor/src/lib.rs Outdated
Comment threadlightning-background-processor/src/lib.rs Outdated
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from dcbb0b3 to bb4abdaCompareApril 24, 2023 20:23
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from bb4abda to feda5d3CompareApril 24, 2023 20:26
@tnull

Copy link
Copy Markdown
ContributorAuthor

Squashed with the fixups:

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index fa8a0ffa..7e4f4791 100644
--- a/lightning-background-processor/src/lib.rs+++ b/lightning-background-processor/src/lib.rs@@ -468,4 +468,5 @@ use core::task;
/// boolean indicating whether the background processing should exit. Once `sleeper` returns a
/// future which outputs `true`, the loop will exit and this function's future will complete.
+/// The `sleeper` future is free to return early after it has triggered the exit condition.
///
/// See [`BackgroundProcessor::start`] for information on which actions this handles.
@@ -514,5 +515,5 @@ use core::task;
/// # type MyScorer = Mutex<lightning::routing::scoring::ProbabilisticScorer<Arc<MyNetworkGraph>, Arc<MyLogger>>>;
///
-/// # fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {+/// # async fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {
/// let background_persister = Arc::clone(&my_persister);
/// let background_event_handler = Arc::clone(&my_event_handler);
@@ -525,15 +526,12 @@ use core::task;
///
/// // Setup the sleeper.
-/// let stop_background_processing = Arc::new(AtomicBool::new(false));-/// let stop_fut = Arc::clone(&stop_background_processing);+/// let (stop_sender, stop_receiver) = tokio::sync::watch::channel(());
///
/// let sleeper = move |d| {
-/// let stop = Arc::clone(&stop_fut);+/// let mut receiver = stop_receiver.clone();
/// Box::pin(async move {
-/// if stop.load(Ordering::Acquire) {-/// true-/// } else {-/// tokio::time::sleep(d).await;-/// false+/// tokio::select!{+/// _ = tokio::time::sleep(d) => false,+/// _ = receiver.changed() => true,
/// }
/// })
@@ -542,5 +540,5 @@ use core::task;
/// let mobile_interruptable_platform = false;
///
-/// tokio::spawn(async move {+/// let handle = tokio::spawn(async move {
/// process_events_async(
/// background_persister,
@@ -560,5 +558,6 @@ use core::task;
///
/// // Stop the background processing.
-/// stop_background_processing.store(true, Ordering::Relaxed);+/// stop_sender.send(()).unwrap();+/// handle.await.unwrap();
/// # }
///```

@TheBlueMattTheBlueMatt mentioned this pull request Apr 24, 2023
@TheBlueMatt
TheBlueMatt merged commit ec3aa49 into lightningdevkit:mainApr 24, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tnull@codecov-commenter@TheBlueMatt@G8XSU@valentinewallace
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Add Tokio example to `process_events_async` docs by tnull · Pull Request #2004 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add Tokio example to process_events_async docs - #2004

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example
Apr 24, 2023
Merged

Add Tokio example to process_events_async docs#2004
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
tnull:2023-02-add-async-bp-example

Conversation

@tnull

@tnulltnull commented Feb 2, 2023

Copy link
Copy Markdown
Contributor

With this we add as simple usage example of process_events_async based on Tokio.

This currently doesn't compile due to #2003, hence tagged blocked and in draft for the time being.

@tnull
tnull marked this pull request as draft February 2, 2023 21:02
Comment threadlightning-background-processor/src/lib.rs Outdated
@codecov-commenter

codecov-commenter commented Feb 2, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage has no change and project coverage change: +0.75 🎉

Comparison is base (bc54441) 91.57% compared to head (610aa40) 92.33%.

❗ Current head 610aa40 differs from pull request most recent head feda5d3. Consider uploading reports for the commit feda5d3 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files
@@ Coverage Diff @@## main #2004 +/- ##
==========================================
+ Coverage 91.57% 92.33% +0.75% 
==========================================
Files 104 104 Lines 51553 61120 +9567 Branches 51553 61120 +9567 ==========================================
+ Hits 47212 56434 +9222 - Misses 4341 4686 +345 
Impacted FilesCoverage Δ
lightning-background-processor/src/lib.rs77.10% <ø> (-6.47%)⬇️

... and 39 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 9079705 to 610aa40CompareApril 21, 2023 14:33
@tnull
tnull marked this pull request as ready for review April 21, 2023 14:33
@tnull

Copy link
Copy Markdown
ContributorAuthor

Rebased on main, should be ready-to-go as soon as #2199 lands.

G8XSU
G8XSU previously approved these changes Apr 21, 2023
@tnull

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt Given the async BP is usable now, should/can we still squeeze this in 115?

///
/// For example, in order to process background events in a [Tokio](https://tokio.rs/) task, you
/// could setup `process_events_async` like this:
/// ```ignore

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be able to remove the ignore now

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mh, not exactly, the ignore is there so I don't have to create pages of mock object for the below list of objects (persister, event handler, chain monitor, channel manager, etc.) without the test failing.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Would it be possible to do something like this?

//! type TxBroadcaster = dyn lightning::chain::chaininterface::BroadcasterInterface + Send + Sync;
//! type FeeEstimator = dyn lightning::chain::chaininterface::FeeEstimator + Send + Sync;
//! type Logger = dyn lightning::util::logger::Logger + Send + Sync;
//! type NodeSigner = dyn lightning::chain::keysinterface::NodeSigner + Send + Sync;
//! type UtxoLookup = dyn lightning::routing::utxo::UtxoLookup + Send + Sync;
//! type ChainFilter = dyn lightning::chain::Filter + Send + Sync;
//! type DataPersister = dyn lightning::chain::chainmonitor::Persist<lightning::chain::keysinterface::InMemorySigner> + Send + Sync;
//! type ChainMonitor = lightning::chain::chainmonitor::ChainMonitor<lightning::chain::keysinterface::InMemorySigner, Arc<ChainFilter>, Arc<TxBroadcaster>, Arc<FeeEstimator>, Arc<Logger>, Arc<DataPersister>>;
//! type ChannelManager = Arc<lightning::ln::channelmanager::SimpleArcChannelManager<ChainMonitor, TxBroadcaster, FeeEstimator, Logger>>;
//! type PeerManager = Arc<lightning::ln::peer_handler::SimpleArcPeerManager<lightning_net_tokio::SocketDescriptor, ChainMonitor, TxBroadcaster, FeeEstimator, UtxoLookup, Logger>>;
//!
//! // Connect to node with pubkey their_node_id at addr:
//! async fn connect_to_node(peer_manager: PeerManager, chain_monitor: Arc<ChainMonitor>, channel_manager: ChannelManager, their_node_id: PublicKey, addr: SocketAddr) {
//! lightning_net_tokio::connect_outbound(peer_manager, their_node_id, addr).await;
//! loop {
//! let event_handler = |event: Event| {
//! // Handle the event!
//! };
//! channel_manager.await_persistable_update();
//! channel_manager.process_pending_events(&event_handler);
//! chain_monitor.process_pending_events(&event_handler);
//! }
//! }
i.e. define dyn objects, then have a method that takes them. You could prefix the type def lines with # so they don't show up in the docs.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turned out to be not as straight-forward, but now went ~this way with 1f60a63.

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Sorry missed your comment, happy to squeeze this in if its ready to go, can you go ahead and squash the fixups?

Comment threadlightning-background-processor/src/lib.rs
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from 1a92dc5 to dcbb0b3CompareApril 24, 2023 19:57
Comment threadlightning-background-processor/src/lib.rs Outdated
Comment threadlightning-background-processor/src/lib.rs Outdated
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from dcbb0b3 to bb4abdaCompareApril 24, 2023 20:23
@tnull
tnullforce-pushed the 2023-02-add-async-bp-example branch from bb4abda to feda5d3CompareApril 24, 2023 20:26
@tnull

Copy link
Copy Markdown
ContributorAuthor

Squashed with the fixups:

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index fa8a0ffa..7e4f4791 100644
--- a/lightning-background-processor/src/lib.rs+++ b/lightning-background-processor/src/lib.rs@@ -468,4 +468,5 @@ use core::task;
/// boolean indicating whether the background processing should exit. Once `sleeper` returns a
/// future which outputs `true`, the loop will exit and this function's future will complete.
+/// The `sleeper` future is free to return early after it has triggered the exit condition.
///
/// See [`BackgroundProcessor::start`] for information on which actions this handles.
@@ -514,5 +515,5 @@ use core::task;
/// # type MyScorer = Mutex<lightning::routing::scoring::ProbabilisticScorer<Arc<MyNetworkGraph>, Arc<MyLogger>>>;
///
-/// # fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {+/// # async fn setup_background_processing(my_persister: Arc<MyPersister>, 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>) {
/// let background_persister = Arc::clone(&my_persister);
/// let background_event_handler = Arc::clone(&my_event_handler);
@@ -525,15 +526,12 @@ use core::task;
///
/// // Setup the sleeper.
-/// let stop_background_processing = Arc::new(AtomicBool::new(false));-/// let stop_fut = Arc::clone(&stop_background_processing);+/// let (stop_sender, stop_receiver) = tokio::sync::watch::channel(());
///
/// let sleeper = move |d| {
-/// let stop = Arc::clone(&stop_fut);+/// let mut receiver = stop_receiver.clone();
/// Box::pin(async move {
-/// if stop.load(Ordering::Acquire) {-/// true-/// } else {-/// tokio::time::sleep(d).await;-/// false+/// tokio::select!{+/// _ = tokio::time::sleep(d) => false,+/// _ = receiver.changed() => true,
/// }
/// })
@@ -542,5 +540,5 @@ use core::task;
/// let mobile_interruptable_platform = false;
///
-/// tokio::spawn(async move {+/// let handle = tokio::spawn(async move {
/// process_events_async(
/// background_persister,
@@ -560,5 +558,6 @@ use core::task;
///
/// // Stop the background processing.
-/// stop_background_processing.store(true, Ordering::Relaxed);+/// stop_sender.send(()).unwrap();+/// handle.await.unwrap();
/// # }
///```

@TheBlueMattTheBlueMatt mentioned this pull request Apr 24, 2023
@TheBlueMatt
TheBlueMatt merged commit ec3aa49 into lightningdevkit:mainApr 24, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@tnull@codecov-commenter@TheBlueMatt@G8XSU@valentinewallace