Skip to content

swarm/src/lib: Continue polling network when behaviour is blocked #2304

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Oct 26, 2021
Merged

swarm/src/lib: Continue polling network when behaviour is blocked #2304

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9749dbb
swarm/src/lib: Continue polling network when behaviour is blocked
mxinden Oct 20, 2021
fe0ea83
Merge branch 'master' into not-pending-on-network-progress
mxinden Oct 20, 2021
bd83cf3
Merge branch 'master' into not-pending-on-network-progress
mxinden Oct 26, 2021
f6a3199
swarm/src/lib: Continue polling network on first notify_* call
mxinden Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions swarm/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,11 @@ where
if let Some(mut conn) = peer.connection(conn_id) {
if let Some(event) = notify_one(&mut conn, event, cx) {
this.pending_event = Some((peer_id, handler, event));
return Poll::Pending;
if network_not_ready {
return Poll::Pending;
} else {
continue;
}
}
}
}
Expand All @@ -775,7 +779,11 @@ where
{
let handler = PendingNotifyHandler::Any(ids);
this.pending_event = Some((peer_id, handler, event));
return Poll::Pending;
if network_not_ready {
return Poll::Pending;
} else {
continue;
}
}
}
}
Expand Down Expand Up @@ -843,7 +851,11 @@ where
if let Some(event) = notify_one(&mut conn, event, cx) {
let handler = PendingNotifyHandler::One(connection);
this.pending_event = Some((peer_id, handler, event));
return Poll::Pending;
if network_not_ready {
return Poll::Pending;
} else {
continue;
}
}
}
}
Expand All @@ -854,7 +866,11 @@ where
{
let handler = PendingNotifyHandler::Any(ids);
this.pending_event = Some((peer_id, handler, event));
return Poll::Pending;
if network_not_ready {
return Poll::Pending;
} else {
continue;
}
}
}
}
Expand Down