cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #471 from b-m-f/split-network-loops

Browse Source 
Split network and swarm discovery loop, break each when not ready
This commit is contained in:
Age Manning 2019-07-30 23:37:43 +10:00 committed by GitHub
commit c695aa3c92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
beacon_node/network/src/service.rs
View File

@ -106,10 +106,8 @@ fn network_service<E: EthSpec>(
log: slog::Logger, log: slog::Logger,
) -> impl futures::Future<Item = (), Error = eth2_libp2p::error::Error> { ) -> impl futures::Future<Item = (), Error = eth2_libp2p::error::Error> {
futures::future::poll_fn(move || -> Result<_, eth2_libp2p::error::Error> { futures::future::poll_fn(move || -> Result<_, eth2_libp2p::error::Error> {
// only end the loop once both major polls are not ready. // if the network channel is not ready, try the swarm
let mut not_ready_count = 0; loop {
while not_ready_count < 2 {
not_ready_count = 0;
// poll the network channel // poll the network channel
match network_recv.poll() { match network_recv.poll() {
Ok(Async::Ready(Some(message))) => match message { Ok(Async::Ready(Some(message))) => match message {
@ -124,7 +122,7 @@ fn network_service<E: EthSpec>(
libp2p_service.lock().swarm.publish(topics, *message); libp2p_service.lock().swarm.publish(topics, *message);
} }
}, },
Ok(Async::NotReady) => not_ready_count += 1, Ok(Async::NotReady) => break,
Ok(Async::Ready(None)) => { Ok(Async::Ready(None)) => {
return Err(eth2_libp2p::error::Error::from("Network channel closed")); return Err(eth2_libp2p::error::Error::from("Network channel closed"));
} }
@ -132,7 +130,9 @@ fn network_service<E: EthSpec>(
return Err(eth2_libp2p::error::Error::from("Network channel error")); return Err(eth2_libp2p::error::Error::from("Network channel error"));
} }
} }
}
loop {
// poll the swarm // poll the swarm
match libp2p_service.lock().poll() { match libp2p_service.lock().poll() {
Ok(Async::Ready(Some(event))) => match event { Ok(Async::Ready(Some(event))) => match event {
@ -165,8 +165,8 @@ fn network_service<E: EthSpec>(
} }
}, },
Ok(Async::Ready(None)) => unreachable!("Stream never ends"), Ok(Async::Ready(None)) => unreachable!("Stream never ends"),
Ok(Async::NotReady) => not_ready_count += 1, Ok(Async::NotReady) => break,
Err(_) => not_ready_count += 1, Err(_) => break,
} }
} }