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

Cleanup register_tick special handling (#6462)

Browse Source
This commit is contained in:
Justin Starry
2019-10-21 10:51:02 -04:00
committed by GitHub
parent 91920cc390
commit 09abbd93b1
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ledger/src/blocktree_processor.rs
View File

@ -943,7 +943,7 @@ pub mod tests {
assert_eq!(bank_forks_info.len(), 1); assert_eq!(bank_forks_info.len(), 1);
assert_eq!(bank_forks_info[0], BankForksInfo { bank_slot: 0 }); assert_eq!(bank_forks_info[0], BankForksInfo { bank_slot: 0 });
let bank = bank_forks[0].clone(); let bank = bank_forks[0].clone();
assert_eq!(bank.tick_height(), 0); assert_eq!(bank.tick_height(), 1);
} }
#[test] #[test]

28
runtime/src/bank.rs
View File

@ -791,29 +791,13 @@ impl Bank {
// TODO: put this assert back in // TODO: put this assert back in
// assert!(!self.is_frozen()); // assert!(!self.is_frozen());
let current_tick_height = self.tick_height.load(Ordering::Relaxed) as u64;
let should_register_hash = {
if self.ticks_per_slot() != 1 || self.slot() != 0 {
let lock = {
if current_tick_height % self.ticks_per_slot == self.ticks_per_slot - 1 {
Some(self.blockhash_queue.write().unwrap())
} else {
None
}
};
self.tick_height.fetch_add(1, Ordering::Relaxed);
inc_new_counter_debug!("bank-register_tick-registered", 1); inc_new_counter_debug!("bank-register_tick-registered", 1);
lock let current_tick_height = self.tick_height.fetch_add(1, Ordering::Relaxed) as u64;
} else if current_tick_height % self.ticks_per_slot == 0 { if current_tick_height % self.ticks_per_slot == self.ticks_per_slot - 1 {
// Register a new block hash if at the last tick in the slot self.blockhash_queue
Some(self.blockhash_queue.write().unwrap()) .write()
} else { .unwrap()
None .register_hash(hash, &self.fee_calculator);
}
};
if let Some(mut w_blockhash_queue) = should_register_hash {
w_blockhash_queue.register_hash(hash, &self.fee_calculator);
} }
} }