blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove PacketDeserializer's extra overflow guard (#29715)

This commit is contained in:
Ryo Onodera 2023-01-17 14:21:17 +09:00 committed by GitHub
parent 461dafb887
commit 156454c980
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/src/packet_deserializer.rs
View File

@ -84,17 +84,23 @@ impl PacketDeserializer {
packet_count_upperbound: usize, packet_count_upperbound: usize,
) -> Result<(Vec<PacketBatch>, Option<SigverifyTracerPacketStats>), RecvTimeoutError> { ) -> Result<(Vec<PacketBatch>, Option<SigverifyTracerPacketStats>), RecvTimeoutError> {
let start = Instant::now(); let start = Instant::now();
let (mut packet_batches, mut aggregated_tracer_packet_stats_option) =
self.packet_batch_receiver.recv_timeout(recv_timeout)?;
let mut num_packets_received: usize = packet_batches.iter().map(|batch| batch.len()).sum(); let (mut packet_batches_received_so_far, mut aggregated_tracer_packet_stats_option) =
while let Ok((packet_batch, tracer_packet_stats_option)) = self.packet_batch_receiver.recv_timeout(recv_timeout)?;
let mut num_packets_received = packet_batches_received_so_far
.iter()
.map(|batch| batch.len())
.sum::<usize>();
while let Ok((packet_batches, tracer_packet_stats_option)) =
self.packet_batch_receiver.try_recv() self.packet_batch_receiver.try_recv()
{ {
trace!("got more packet batches in packet deserializer"); trace!("got more packet batches in packet deserializer");
let (packets_received, packet_count_overflowed) = num_packets_received num_packets_received += packet_batches
.overflowing_add(packet_batch.iter().map(|batch| batch.len()).sum()); .iter()
packet_batches.extend(packet_batch); .map(|batch| batch.len())
.sum::<usize>();
packet_batches_received_so_far.extend(packet_batches);
if let Some(tracer_packet_stats) = &tracer_packet_stats_option { if let Some(tracer_packet_stats) = &tracer_packet_stats_option {
if let Some(aggregated_tracer_packet_stats) = if let Some(aggregated_tracer_packet_stats) =
@ -106,16 +112,15 @@ impl PacketDeserializer {
} }
} }
if start.elapsed() >= recv_timeout if start.elapsed() >= recv_timeout || num_packets_received >= packet_count_upperbound {
|| packet_count_overflowed
|| packets_received >= packet_count_upperbound
{
break; break;
} }
num_packets_received = packets_received;
} }
Ok((packet_batches, aggregated_tracer_packet_stats_option)) Ok((
packet_batches_received_so_far,
aggregated_tracer_packet_stats_option,
))
} }
fn generate_packet_indexes(packet_batch: &PacketBatch) -> Vec<usize> { fn generate_packet_indexes(packet_batch: &PacketBatch) -> Vec<usize> {