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

Removed Arcs from PohConfig parameters and pass the struct by reference only

This commit is contained in:
Jason Davis 2022-12-06 15:48:32 -06:00 committed by Jason
parent 00f5a176a0
commit 8f24ceffbd
6 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/banking_stage.rs
View File

@ -2392,7 +2392,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
let recorder = poh_recorder.recorder();
@ -2618,7 +2618,7 @@ mod tests {
&pubkey,
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
let recorder = poh_recorder.recorder();
@ -2755,7 +2755,7 @@ mod tests {
&pubkey,
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
let recorder = poh_recorder.recorder();
@ -2829,7 +2829,7 @@ mod tests {
&pubkey,
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
let recorder = poh_recorder.recorder();
@ -2983,7 +2983,7 @@ mod tests {
&pubkey,
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
let recorder = poh_recorder.recorder();
@ -3061,7 +3061,7 @@ mod tests {
&solana_sdk::pubkey::new_rand(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -3128,7 +3128,7 @@ mod tests {
&Pubkey::new_unique(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
let recorder = poh_recorder.recorder();
@ -3334,7 +3334,7 @@ mod tests {
&pubkey,
&blockstore,
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
let recorder = poh_recorder.recorder();
@ -3503,7 +3503,7 @@ mod tests {
&Pubkey::new_unique(),
&blockstore,
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
let recorder = poh_recorder.recorder();
@ -3610,7 +3610,7 @@ mod tests {
&solana_sdk::pubkey::new_rand(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
exit,
);
let poh_recorder = Arc::new(RwLock::new(poh_recorder));

2
core/src/replay_stage.rs
View File

@ -3719,7 +3719,7 @@ pub(crate) mod tests {
&Pubkey::default(),
&blockstore,
&leader_schedule_cache,
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::new(false)),
)
.0,

2
core/src/validator.rs
View File

@ -715,7 +715,7 @@ impl Validator {
max_slots.clone(),
);
let poh_config = Arc::new(genesis_config.poh_config.clone());
let poh_config = genesis_config.poh_config.clone();
let startup_verification_complete;
let (poh_recorder, entry_receiver, record_receiver) = {
let bank = &bank_forks.read().unwrap().working_bank();

52
poh/src/poh_recorder.rs
View File

@ -225,7 +225,7 @@ pub struct PohRecorder {
id: Pubkey,
blockstore: Arc<Blockstore>,
leader_schedule_cache: Arc<LeaderScheduleCache>,
poh_config: Arc<PohConfig>,
poh_config: PohConfig,
ticks_per_slot: u64,
target_ns_per_tick: u64,
record_lock_contention_us: u64,
@ -827,7 +827,7 @@ impl PohRecorder {
blockstore: &Arc<Blockstore>,
clear_bank_signal: Option<Sender<bool>>,
leader_schedule_cache: &Arc<LeaderScheduleCache>,
poh_config: &Arc<PohConfig>,
poh_config: &PohConfig,
poh_timing_point_sender: Option<PohTimingSender>,
is_exited: Arc<AtomicBool>,
) -> (Self, Receiver<WorkingBankEntry>, Receiver<Record>) {
@ -898,7 +898,7 @@ impl PohRecorder {
id: &Pubkey,
blockstore: &Arc<Blockstore>,
leader_schedule_cache: &Arc<LeaderScheduleCache>,
poh_config: &Arc<PohConfig>,
poh_config: &PohConfig,
is_exited: Arc<AtomicBool>,
) -> (Self, Receiver<WorkingBankEntry>, Receiver<Record>) {
Self::new_with_clear_signal(
@ -960,7 +960,7 @@ pub fn create_test_recorder(
None => Arc::new(LeaderScheduleCache::new_from_bank(bank)),
};
let exit = Arc::new(AtomicBool::new(false));
let poh_config = Arc::new(poh_config.unwrap_or_default());
let poh_config = poh_config.unwrap_or_default();
let (mut poh_recorder, entry_receiver, record_receiver) = PohRecorder::new(
bank.tick_height(),
bank.last_blockhash(),
@ -1019,7 +1019,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::default()),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
poh_recorder.tick();
@ -1049,7 +1049,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::default()),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
poh_recorder.tick();
@ -1078,7 +1078,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::default()),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
poh_recorder.tick();
@ -1107,7 +1107,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1137,7 +1137,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank0)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1200,7 +1200,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1249,7 +1249,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank0)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1292,7 +1292,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1334,7 +1334,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank0)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1390,7 +1390,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1430,7 +1430,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1502,7 +1502,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank0)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1558,7 +1558,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::default()),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
poh_recorder.tick();
@ -1587,7 +1587,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::default()),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
poh_recorder.tick();
@ -1618,7 +1618,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::default()),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
poh_recorder.tick();
@ -1652,7 +1652,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1684,7 +1684,7 @@ mod tests {
&Arc::new(blockstore),
Some(sender),
&Arc::new(LeaderScheduleCache::default()),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
None,
Arc::new(AtomicBool::default()),
);
@ -1719,7 +1719,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1767,7 +1767,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&leader_schedule_cache,
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1830,7 +1830,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank0)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -1991,7 +1991,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
@ -2043,7 +2043,7 @@ mod tests {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);
//create a new bank

6
poh/src/poh_service.rs
View File

@ -96,7 +96,7 @@ impl PohTiming {
impl PohService {
pub fn new(
poh_recorder: Arc<RwLock<PohRecorder>>,
poh_config: &Arc<PohConfig>,
poh_config: &PohConfig,
poh_exit: &Arc<AtomicBool>,
ticks_per_slot: u64,
pinned_cpu_core: usize,
@ -414,11 +414,11 @@ mod tests {
let default_target_tick_duration =
timing::duration_as_us(&PohConfig::default().target_tick_duration);
let target_tick_duration = Duration::from_micros(default_target_tick_duration);
let poh_config = Arc::new(PohConfig {
let poh_config = PohConfig {
hashes_per_tick: Some(clock::DEFAULT_HASHES_PER_TICK),
target_tick_duration,
target_tick_count: None,
});
};
let exit = Arc::new(AtomicBool::new(false));
let ticks_per_slot = bank.ticks_per_slot();

2
rpc/src/cluster_tpu_info.rs
View File

@ -108,7 +108,7 @@ mod test {
&Pubkey::default(),
&Arc::new(blockstore),
&Arc::new(LeaderScheduleCache::new_from_bank(&bank)),
&Arc::new(PohConfig::default()),
&PohConfig::default(),
Arc::new(AtomicBool::default()),
);