-
Notifications
You must be signed in to change notification settings - Fork 159
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Setup Forest execution threads #236
Merged
Merged
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
5d551c1
Run networking service in seperate thread and handle SIGINT
austinabell 5403a06
fmt
austinabell 8654883
change variable name
austinabell 8fe6afc
Greg is literally trolling
austinabell 7a0e348
Add thread sleep to avoid busy loop
austinabell 1b3f3d2
change from sleeping thread to oneshot channel
austinabell 680e07a
Merge branch 'master' of github.com:ChainSafe/forest into austin/node…
austinabell File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,9 @@ use async_std::task; | |
use forest_libp2p::{get_keypair, Libp2pService}; | ||
use libp2p::identity::{ed25519, Keypair}; | ||
use slog::{info, trace}; | ||
use std::process; | ||
use std::sync::atomic::{AtomicUsize, Ordering}; | ||
use std::sync::Arc; | ||
use utils::write_to_file; | ||
|
||
#[async_std::main] | ||
|
@@ -36,11 +39,32 @@ async fn main() { | |
} | ||
}; | ||
|
||
let lp2p_service = Libp2pService::new(logger, &config.network, net_keypair); | ||
let running = Arc::new(AtomicUsize::new(0)); | ||
let r = running.clone(); | ||
ctrlc::set_handler(move || { | ||
let prev = r.fetch_add(1, Ordering::SeqCst); | ||
if prev == 0 { | ||
println!("Got interrupt, shutting down..."); | ||
} else { | ||
process::exit(0); | ||
} | ||
}) | ||
.expect("Error setting Ctrl-C handler"); | ||
|
||
task::block_on(async move { | ||
// Start libp2p service | ||
let lp2p_service = Libp2pService::new(logger, &config.network, net_keypair); | ||
let lp2p_thread = task::spawn(async { | ||
lp2p_service.run().await; | ||
}); | ||
|
||
loop { | ||
if running.load(Ordering::SeqCst) > 0 { | ||
// TODO change dropping threads to gracefully shutting down services | ||
// or implement drop on components with sensitive shutdown | ||
drop(lp2p_thread); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: p2p_thread |
||
break; | ||
} | ||
} | ||
|
||
info!(log, "Forest finish shutdown"); | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would just call it p2p_service
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unchanged in this PR, but changed it haha