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

fixes backports code changes (#20541)

Browse Source
This commit is contained in:
behzad nouri
2021-10-08 15:30:27 +00:00
committed by GitHub
parent afe866ad02
commit c693ecc4c8
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/benches/cluster_info.rs
View File

@ -75,9 +75,9 @@ fn broadcast_shreds_bench(bencher: &mut Bencher) {
&cluster_nodes_cache, &cluster_nodes_cache,
&last_datapoint, &last_datapoint,
&mut TransmitShredsStats::default(), &mut TransmitShredsStats::default(),
&SocketAddrSpace::Unspecified,
&cluster_info, &cluster_info,
&bank_forks, &bank_forks,
&SocketAddrSpace::Unspecified,
) )
.unwrap(); .unwrap();
}); });

16
core/src/broadcast_stage.rs
View File

@ -22,8 +22,10 @@ use {
solana_metrics::{inc_new_counter_error, inc_new_counter_info}, solana_metrics::{inc_new_counter_error, inc_new_counter_info},
solana_poh::poh_recorder::WorkingBankEntry, solana_poh::poh_recorder::WorkingBankEntry,
solana_runtime::{bank::Bank, bank_forks::BankForks}, solana_runtime::{bank::Bank, bank_forks::BankForks},
solana_sdk::timing::{timestamp, AtomicInterval}, solana_sdk::{
solana_sdk::{clock::Slot, pubkey::Pubkey}, timing::{timestamp, AtomicInterval},
{clock::Slot, pubkey::Pubkey},
},
solana_streamer::{ solana_streamer::{
sendmmsg::{batch_send, SendPktsError}, sendmmsg::{batch_send, SendPktsError},
socket::SocketAddrSpace, socket::SocketAddrSpace,
@ -31,9 +33,11 @@ use {
std::{ std::{
collections::HashMap, collections::HashMap,
net::UdpSocket, net::UdpSocket,
sync::atomic::{AtomicBool, Ordering}, sync::{
sync::mpsc::{channel, Receiver, RecvError, RecvTimeoutError, Sender}, atomic::{AtomicBool, Ordering},
sync::{Arc, Mutex, RwLock}, mpsc::{channel, Receiver, RecvError, RecvTimeoutError, Sender},
Arc, Mutex, RwLock,
},
thread::{self, Builder, JoinHandle}, thread::{self, Builder, JoinHandle},
time::{Duration, Instant}, time::{Duration, Instant},
}, },
@ -399,9 +403,9 @@ pub fn broadcast_shreds(
cluster_nodes_cache: &ClusterNodesCache<BroadcastStage>, cluster_nodes_cache: &ClusterNodesCache<BroadcastStage>,
last_datapoint_submit: &Arc<AtomicInterval>, last_datapoint_submit: &Arc<AtomicInterval>,
transmit_stats: &mut TransmitShredsStats, transmit_stats: &mut TransmitShredsStats,
socket_addr_space: &SocketAddrSpace,
cluster_info: &ClusterInfo, cluster_info: &ClusterInfo,
bank_forks: &Arc<RwLock<BankForks>>, bank_forks: &Arc<RwLock<BankForks>>,
socket_addr_space: &SocketAddrSpace,
) -> Result<()> { ) -> Result<()> {
let mut result = Ok(()); let mut result = Ok(());
let mut shred_select = Measure::start("shred_select"); let mut shred_select = Measure::start("shred_select");

2
core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs
View File

@ -145,9 +145,9 @@ impl BroadcastRun for FailEntryVerificationBroadcastRun {
&self.cluster_nodes_cache, &self.cluster_nodes_cache,
&Arc::new(AtomicInterval::default()), &Arc::new(AtomicInterval::default()),
&mut TransmitShredsStats::default(), &mut TransmitShredsStats::default(),
cluster_info.socket_addr_space(),
cluster_info, cluster_info,
bank_forks, bank_forks,
cluster_info.socket_addr_space(),
) )
} }
fn record( fn record(

2
core/src/broadcast_stage/standard_broadcast_run.rs
View File

@ -362,9 +362,9 @@ impl StandardBroadcastRun {
&self.cluster_nodes_cache, &self.cluster_nodes_cache,
&self.last_datapoint_submit, &self.last_datapoint_submit,
&mut transmit_stats, &mut transmit_stats,
cluster_info.socket_addr_space(),
cluster_info, cluster_info,
bank_forks, bank_forks,
cluster_info.socket_addr_space(),
)?; )?;
transmit_time.stop(); transmit_time.stop();