Cleanup register_tick special handling (#6462)
This commit is contained in:
parent
91920cc390
commit
09abbd93b1
|
@ -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]
|
||||||
|
|
|
@ -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;
|
inc_new_counter_debug!("bank-register_tick-registered", 1);
|
||||||
let should_register_hash = {
|
let current_tick_height = self.tick_height.fetch_add(1, Ordering::Relaxed) as u64;
|
||||||
if self.ticks_per_slot() != 1 || self.slot() != 0 {
|
if current_tick_height % self.ticks_per_slot == self.ticks_per_slot - 1 {
|
||||||
let lock = {
|
self.blockhash_queue
|
||||||
if current_tick_height % self.ticks_per_slot == self.ticks_per_slot - 1 {
|
.write()
|
||||||
Some(self.blockhash_queue.write().unwrap())
|
.unwrap()
|
||||||
} else {
|
.register_hash(hash, &self.fee_calculator);
|
||||||
None
|
|
||||||
}
|
|
||||||
};
|
|
||||||
self.tick_height.fetch_add(1, Ordering::Relaxed);
|
|
||||||
inc_new_counter_debug!("bank-register_tick-registered", 1);
|
|
||||||
lock
|
|
||||||
} else if current_tick_height % self.ticks_per_slot == 0 {
|
|
||||||
// Register a new block hash if at the last tick in the slot
|
|
||||||
Some(self.blockhash_queue.write().unwrap())
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if let Some(mut w_blockhash_queue) = should_register_hash {
|
|
||||||
w_blockhash_queue.register_hash(hash, &self.fee_calculator);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue