Skip to content

ping: Fix memory leak of unremoved pending_opens #274

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
lexnv merged 2 commits into from
Oct 24, 2024
Merged

ping: Fix memory leak of unremoved pending_opens #274

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d93cbe
ping: Fix memory leak of unremoved `pending_opens`
lexnv Oct 23, 2024
6f9eb61
Merge branch 'master' into lexnv/fix-ping-leak
lexnv Oct 24, 2024
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
23 changes: 3 additions & 20 deletions src/protocol/libp2p/ping/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use futures::{future::BoxFuture, stream::FuturesUnordered, StreamExt};
use tokio::sync::mpsc::Sender;

use std::{
collections::{HashMap, HashSet},
collections::HashSet,
time::{Duration, Instant},
};

Expand Down Expand Up @@ -72,9 +72,6 @@ pub(crate) struct Ping {
/// Connected peers.
peers: HashSet<PeerId>,

/// Pending outbound substreams.
pending_opens: HashMap<SubstreamId, PeerId>,

/// Pending outbound substreams.
pending_outbound: FuturesUnordered<BoxFuture<'static, crate::Result<(PeerId, Duration)>>>,

Expand All @@ -89,7 +86,6 @@ impl Ping {
service,
tx: config.tx_event,
peers: HashSet::new(),
pending_opens: HashMap::new(),
pending_outbound: FuturesUnordered::new(),
pending_inbound: FuturesUnordered::new(),
_max_failures: config.max_failures,
Expand All @@ -100,8 +96,7 @@ impl Ping {
fn on_connection_established(&mut self, peer: PeerId) -> crate::Result<()> {
tracing::trace!(target: LOG_TARGET, ?peer, "connection established");

let substream_id = self.service.open_substream(peer)?;
self.pending_opens.insert(substream_id, peer);
self.service.open_substream(peer)?;
self.peers.insert(peer);

Ok(())
Expand Down Expand Up @@ -191,19 +186,7 @@ impl Ping {
self.on_inbound_substream(peer, substream);
}
Direction::Outbound(substream_id) => {
match self.pending_opens.remove(&substream_id) {
Some(stored_peer) => {
debug_assert!(peer == stored_peer);
self.on_outbound_substream(peer, substream_id, substream);
}
None => {
tracing::warn!(
target: LOG_TARGET,
?substream_id,
"outbound ping substream ID does not exist",
);
}
}
self.on_outbound_substream(peer, substream_id, substream);
}
},
Some(_) => {}
Expand Down