gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Optimize retransmit stage (#6231)

Browse Source 
* Optimize retransmit stage

* Remove comment

* Fix test

* Skip iteration to fixup 0 stakes
This commit is contained in:
Sagar Dhawan
2019-10-04 11:52:02 -07:00
committed by GitHub
parent b5f7a4bff9
commit 23ea8ae56b
4 changed files with 95 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/tests/cluster_info.rs
View File

@ -50,15 +50,16 @@ fn retransmit(
}
});
seed[0..4].copy_from_slice(&blob.to_le_bytes());
let (neighbors, children) = compute_retransmit_peers(fanout, my_index, shuffled_nodes);
children.iter().for_each(|p| {
let s = senders.get(&p.id).unwrap();
let shuffled_indices = (0..shuffled_nodes.len()).collect();
let (neighbors, children) = compute_retransmit_peers(fanout, my_index, shuffled_indices);
children.into_iter().for_each(|i| {
let s = senders.get(&shuffled_nodes[i].id).unwrap();
let _ = s.send((blob, retransmit));
});
if retransmit {
neighbors.iter().for_each(|p| {
let s = senders.get(&p.id).unwrap();
neighbors.into_iter().for_each(|i| {
let s = senders.get(&shuffled_nodes[i].id).unwrap();
let _ = s.send((blob, false));
});
}
@ -113,8 +114,17 @@ fn run_simulation(stakes: &[u64], fanout: usize) {
.map(|i| {
let mut seed = [0; 32];
seed[0..4].copy_from_slice(&i.to_le_bytes());
let (_, peers) = cluster_info
.shuffle_peers_and_index(Some(&staked_nodes), ChaChaRng::from_seed(seed));
let (peers, stakes_and_index) =
cluster_info.sorted_retransmit_peers_and_stakes(Some(&staked_nodes));
let (_, shuffled_stakes_and_indexes) = cluster_info.shuffle_peers_and_index(
&peers,
&stakes_and_index,
ChaChaRng::from_seed(seed),
);
let peers = shuffled_stakes_and_indexes
.into_iter()
.map(|(_, i)| peers[i].clone())
.collect();
peers
})
.collect();

3
core/tests/gossip.rs
View File

@ -177,7 +177,8 @@ pub fn cluster_info_retransmit() -> result::Result<()> {
let mut p = Packet::default();
p.meta.size = 10;
let peers = c1.read().unwrap().retransmit_peers();
ClusterInfo::retransmit_to(&c1, &peers, &p, None, &tn1, false)?;
let retransmit_peers: Vec<_> = peers.iter().collect();
ClusterInfo::retransmit_to(&c1, &retransmit_peers, &p, None, &tn1, false)?;
let res: Vec<_> = [tn1, tn2, tn3]
.into_par_iter()
.map(|s| {