8000 perf: don't clone all incoming `PeerMessage`s by jakmeier · Pull Request #9559 · near/nearcore · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

perf: don't clone all incoming PeerMessages #9559

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 1 commit into from
Sep 22, 2023
Merged

perf: don't clone all incoming PeerMessages #9559

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 17 additions & 38 deletions chain/network/src/peer/peer_actor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,14 @@ impl PeerActor {
"handle_msg_ready")
.entered();

match peer_msg.clone() {
// Clones message iff someone is listening on the sink. Should be in tests only.
let message_processed_event = self
.network_state
.config
.event_sink
.delayed_push(|| Event::MessageProcessed(conn.tier, peer_msg.clone()));

match peer_msg {
PeerMessage::Disconnect(d) => {
tracing::debug!(target: "network", "Disconnect signal. Me: {:?} Peer: {:?}", self.my_node_info.id, self.other_peer_id());

Expand Down Expand Up @@ -1125,10 +1132,7 @@ impl PeerActor {
direct_peers,
}));
}
self.network_state
.config
.event_sink
.push(Event::MessageProcessed(conn.tier, peer_msg));
message_processed_event();
}
PeerMessage::PeersResponse(PeersResponse { peers, direct_peers }) => {
tracing::debug!(target: "network", "Received peers from {}: {} peers and {} direct peers.", self.peer_info, peers.len(), direct_peers.len());
Expand All @@ -1154,11 +1158,7 @@ impl PeerActor {
&self.clock,
direct_peers.into_iter().filter(|peer_info| peer_info.id != node_id),
);

self.network_state
.config
.event_sink
.push(Event::MessageProcessed(conn.tier, peer_msg));
message_processed_event();
}
PeerMessage::RequestUpdateNonce(edge_info) => {
let clock = self.clock.clone();
Expand All @@ -1185,10 +1185,7 @@ impl PeerActor {
}
}
};
network_state
.config
.event_sink
.push(Event::MessageProcessed(conn.tier, peer_msg));
message_processed_event();
}));
}
PeerMessage::SyncRoutingTable(rtu) => {
Expand All @@ -1198,10 +1195,7 @@ impl PeerActor {
ctx.spawn(wrap_future(async move {
Self::handle_sync_routing_table(&clock, &network_state, conn.clone(), rtu)
.await;
network_state
.config
.event_sink
.push(Event::MessageProcessed(conn.tier, peer_msg));
message_processed_event();
}));
}
PeerMessage::DistanceVector(dv) => {
Expand All @@ -1210,10 +1204,7 @@ impl PeerActor {
let network_state = self.network_state.clone();
ctx.spawn(wrap_future(async move {
Self::handle_distance_vector(&clock, &network_state, conn.clone(), dv).await;
network_state
.config
.event_sink
.push(Event::MessageProcessed(conn.tier, peer_msg));
message_processed_event();
}));
}
PeerMessage::SyncAccountsData(msg) => {
Expand Down Expand Up @@ -1242,10 +1233,7 @@ impl PeerActor {
}
// Early exit, if there is no data in the message.
if msg.accounts_data.is_empty() {
network_state
.config
.event_sink
.push(Event::MessageProcessed(conn.tier, peer_msg));
message_processed_event();
return;
}
let network_state = self.network_state.clone();
Expand All @@ -1260,10 +1248,7 @@ impl PeerActor {
AccountDataError::SingleAccountMultipleData => ReasonForBan::Abusive,
}));
}
network_state
.config
.event_sink
.push(Event::MessageProcessed(conn.tier, peer_msg));
message_processed_event();
}));
}
PeerMessage::Routed(mut msg) => {
Expand Down Expand Up @@ -1332,17 +1317,11 @@ impl PeerActor {
// TODO(gprusak): deprecate Event::Ping/Pong in favor of
// MessageProcessed.
self.network_state.config.event_sink.push(Event::Ping(ping.clone()));
self.network_state
.config
.event_sink
.push(Event::MessageProcessed(conn.tier, PeerMessage::Routed(msg)));
message_processed_event();
}
RoutedMessageBody::Pong(pong) => {
self.network_state.config.event_sink.push(Event::Pong(pong.clone()));
self.network_state
.config
.event_sink
.push(Event::MessageProcessed(conn.tier, PeerMessage::Routed(msg)));
message_processed_event();
}
_ => self.receive_message(ctx, &conn, PeerMessage::Routed(msg)),
}
Expand Down
0