fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-07-31 00:41:59 +00:00
Code Issues Projects Releases Wiki Activity

print iterlog in all cases

Browse Source
This commit is contained in:
folex
2020-05-07 14:23:05 +03:00
parent 546407bf28
commit eaddad6117
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
protocols/kad/src/behaviour.rs
View File

@@ -1563,12 +1563,14 @@ where
// Look for a finished query.
loop {
match self.queries.poll(now) {
QueryPoolState::Finished(q) => {
QueryPoolState::Finished(mut q) => {
q.finish();
if let Some(event) = self.query_finished(q, parameters) {
return Poll::Ready(NetworkBehaviourAction::GenerateEvent(event))
}
}
QueryPoolState::Timeout(q) => {
QueryPoolState::Timeout(mut q) => {
q.finish();
if let Some(event) = self.query_timeout(q) {
return Poll::Ready(NetworkBehaviourAction::GenerateEvent(event))
}

47
protocols/kad/src/query/peers/closest.rs
View File

@@ -282,9 +282,6 @@ impl ClosestPeersIter {
// Check if the iterator is at capacity w.r.t. the allowed parallelism.
let at_capacity = self.at_capacity();
let closest = self.closest_peers.values().cloned().collect::<Vec<Peer>>();
let created_at = self.created_at;
for peer in self.closest_peers.values_mut() {
match peer.state {
PeerState::Waiting(timeout) => {
@@ -326,25 +323,10 @@ impl ClosestPeersIter {
// If `num_results` successful results have been delivered for the
// closest peers, the iterator is done.
if *cnt >= self.config.num_results {
let mut log = closest.into_iter().map(|p| {
let log = p.log.iter().map(|(i, s)| {
// TODO: show negative difference?
let elapsed = i.saturating_duration_since(created_at).as_millis().to_string();
format!("[iterlog] \t{: <25?}\t+{}ms\n", s, elapsed)
}).collect::<String>();
format!("[iterlog] {}:\n{}", p.key.into_preimage(), log)
}).collect::<String>();
if log.is_empty() {
log = "[iterlog] empty".into();
}
log::info!(
"[iterlog] ClosestPeerIter: target = {}; Got all {} results, finished. Log:\n{}",
trace!(
"ClosestPeerIter: target = {}; {} peers responded, finished.",
bs58::encode(&self.target).into_string(),
*cnt,
log
*cnt
);
self.state = State::Finished;
return PeersIterState::Finished
@@ -395,7 +377,28 @@ impl ClosestPeersIter {
/// Immediately transitions the iterator to [`PeersIterState::Finished`].
pub fn finish(&mut self) {
self.state = State::Finished
self.state = State::Finished;
// let closest = self.closest_peers.values().cloned().collect::<Vec<Peer>>();
let created_at = self.created_at;
let mut log = self.closest_peers.iter().map(|(_, p)| {
let log = p.log.iter().map(|(i, s)| {
// TODO: show negative difference?
let elapsed = i.saturating_duration_since(created_at).as_millis().to_string();
format!("[iterlog] \t{: <25?}\t+{}ms\n", s, elapsed)
}).collect::<String>();
format!("[iterlog] {}:\n{}", p.key.preimage(), log)
}).collect::<String>();
if log.is_empty() {
log = "[iterlog] empty".into();
}
log::info!(
"[iterlog] ClosestPeerIter: target = {}; finished. Log:\n{}",
bs58::encode(&self.target).into_string(),
log
);
}
/// Checks whether the iterator has finished.