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

Fix copying packets in Window Service (#6429) 

* Fix copying packets in Window Service

* Parallelize over batches instead of within batches
This commit is contained in:
Sagar Dhawan 2019-10-21 12:04:52 -07:00 committed by GitHub
parent 951e1f8b48
commit 364583ea5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
core/src/window_service.rs
View File

@ -78,48 +78,53 @@ where
F: Fn(&Shred, u64) -> bool + Sync,
{
let timer = Duration::from_millis(200);
let mut packets = r.recv_timeout(timer)?;
let mut packets = vec![r.recv_timeout(timer)?];
let mut total_packets = packets[0].packets.len();
while let Ok(mut more_packets) = r.try_recv() {
packets.packets.append(&mut more_packets.packets)
while let Ok(more_packets) = r.try_recv() {
total_packets += more_packets.packets.len();
packets.push(more_packets)
}
let now = Instant::now();
inc_new_counter_debug!("streamer-recv_window-recv", packets.packets.len());
inc_new_counter_debug!("streamer-recv_window-recv", total_packets);
let last_root = blocktree.last_root();
let shreds: Vec<_> = thread_pool.install(|| {
packets
.packets
.par_iter_mut()
.filter_map(|packet| {
if let Ok(shred) = Shred::new_from_serialized_shred(packet.data.to_vec()) {
if shred_filter(&shred, last_root) {
packet.meta.slot = shred.slot();
packet.meta.seed = shred.seed();
Some(shred)
} else {
packet.meta.discard = true;
None
}
} else {
packet.meta.discard = true;
None
}
.flat_map(|packets| {
packets
.packets
.iter_mut()
.filter_map(|packet| {
if let Ok(shred) = Shred::new_from_serialized_shred(packet.data.to_vec()) {
if shred_filter(&shred, last_root) {
packet.meta.slot = shred.slot();
packet.meta.seed = shred.seed();
Some(shred)
} else {
packet.meta.discard = true;
None
}
} else {
packet.meta.discard = true;
None
}
})
.collect::<Vec<_>>()
})
.collect()
});
trace!("{:?} shreds from packets", shreds.len());
trace!(
"{} num shreds received: {}",
my_pubkey,
packets.packets.len()
);
trace!("{} num total shreds received: {}", my_pubkey, total_packets);
if !packets.packets.is_empty() {
// Ignore the send error, as the retransmit is optional (e.g. archivers don't retransmit)
let _ = retransmit.send(packets);
for packets in packets.into_iter() {
if !packets.packets.is_empty() {
// Ignore the send error, as the retransmit is optional (e.g. archivers don't retransmit)
let _ = retransmit.send(packets);
}
}
blocktree.insert_shreds(shreds, Some(leader_schedule_cache))?;