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

refactor packet bach processing

Browse Source 
fix empty
This commit is contained in:
Haoran Yi
2022-02-04 14:47:56 -06:00
parent 15357480ec
commit 77125cd390
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/banking_stage.rs
View File

@ -561,6 +561,7 @@ impl BankingStage {
end_of_slot.next_slot_leader, end_of_slot.next_slot_leader,
banking_stage_stats, banking_stage_stats,
); );
<<<<<<< HEAD
let end_of_slot_filtered_invalid_count = original_unprocessed_indexes let end_of_slot_filtered_invalid_count = original_unprocessed_indexes
.len() .len()
@ -629,6 +630,7 @@ impl BankingStage {
.. ..
} = process_transactions_summary; } = process_transactions_summary;
<<<<<<< HEAD
if reached_max_poh_height if reached_max_poh_height
|| !Bank::should_bank_still_be_processing_txs( || !Bank::should_bank_still_be_processing_txs(
&bank_creation_time, &bank_creation_time,
@ -707,7 +709,6 @@ impl BankingStage {
} }
} }
}); });
proc_start.stop(); proc_start.stop();
debug!( debug!(
@ -2015,7 +2016,7 @@ impl BankingStage {
banking_stage_stats: &mut BankingStageStats, banking_stage_stats: &mut BankingStageStats,
slot_metrics_tracker: &mut LeaderSlotMetricsTracker, slot_metrics_tracker: &mut LeaderSlotMetricsTracker,
) { ) {
if Self::packet_has_more_unprocessed_transactions(&packet_indexes) { if !packet_indexes.is_empty() {
if unprocessed_packet_batches.len() >= batch_limit { if unprocessed_packet_batches.len() >= batch_limit {
*dropped_packet_batches_count += 1; *dropped_packet_batches_count += 1;
if let Some(dropped_batch) = unprocessed_packet_batches.pop_front() { if let Some(dropped_batch) = unprocessed_packet_batches.pop_front() {
@ -2041,10 +2042,6 @@ impl BankingStage {
} }
} }
fn packet_has_more_unprocessed_transactions(packet_indexes: &[usize]) -> bool {
!packet_indexes.is_empty()
}
pub fn join(self) -> thread::Result<()> { pub fn join(self) -> thread::Result<()> {
for bank_thread_hdl in self.bank_thread_hdls { for bank_thread_hdl in self.bank_thread_hdls {
bank_thread_hdl.join()?; bank_thread_hdl.join()?;