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

bast bank ancestor check (#4050)

Browse Source
This commit is contained in:
anatoly yakovenko
2019-04-28 10:27:09 -07:00
committed by GitHub
parent 6f56501034
commit 3e14af5033
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/bank_forks.rs
View File

@ -35,7 +35,8 @@ impl BankForks {
pub fn ancestors(&self) -> HashMap<u64, HashSet<u64>> { pub fn ancestors(&self) -> HashMap<u64, HashSet<u64>> {
let mut ancestors = HashMap::new(); let mut ancestors = HashMap::new();
for bank in self.banks.values() { for bank in self.banks.values() {
let set = bank.parents().into_iter().map(|b| b.slot()).collect(); let mut set: HashSet<u64> = bank.ancestors.keys().cloned().collect();
set.remove(&bank.slot());
ancestors.insert(bank.slot(), set); ancestors.insert(bank.slot(), set);
} }
ancestors ancestors
@ -46,9 +47,11 @@ impl BankForks {
let mut descendants = HashMap::new(); let mut descendants = HashMap::new();
for bank in self.banks.values() { for bank in self.banks.values() {
let _ = descendants.entry(bank.slot()).or_insert(HashSet::new()); let _ = descendants.entry(bank.slot()).or_insert(HashSet::new());
for parent in bank.parents() { let mut set: HashSet<u64> = bank.ancestors.keys().cloned().collect();
set.remove(&bank.slot());
for parent in set {
descendants descendants
.entry(parent.slot()) .entry(parent)
.or_insert(HashSet::new()) .or_insert(HashSet::new())
.insert(bank.slot()); .insert(bank.slot());
} }
@ -116,8 +119,9 @@ impl BankForks {
} }
fn prune_non_root(&mut self, root: u64) { fn prune_non_root(&mut self, root: u64) {
let descendants = self.descendants();
self.banks self.banks
.retain(|slot, bank| *slot >= root || bank.is_in_subtree_of(root)) .retain(|slot, _| descendants[&root].contains(slot))
} }
} }

2
runtime/src/bank.rs
View File

@ -124,7 +124,7 @@ pub struct Bank {
parent: RwLock<Option<Arc<Bank>>>, parent: RwLock<Option<Arc<Bank>>>,
/// The set of parents including this bank /// The set of parents including this bank
ancestors: HashMap<u64, usize>, pub ancestors: HashMap<u64, usize>,
/// Hash of this Bank's state. Only meaningful after freezing. /// Hash of this Bank's state. Only meaningful after freezing.
hash: RwLock<Hash>, hash: RwLock<Hash>,