GRIN/grin-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid double-locking on add eviction. Fixes #936

Browse Source
This commit is contained in:
Ignotus Peverell
2018-04-06 18:46:07 +01:00
parent bc6342ea65
commit 33c5a9835a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chain/src/chain.rs
+5 -1
View File
@@ -87,7 +87,7 @@ impl OrphanBlockPool {
let mut heights = height_idx.keys().cloned().collect::<Vec<u64>>(); let mut heights = height_idx.keys().cloned().collect::<Vec<u64>>();
heights.sort_unstable(); heights.sort_unstable();
for h in heights.iter().rev() { for h in heights.iter().rev() {
let _ = self.remove_by_height(h); let _ = self.remove_by_height_nolock(h);
if orphans.len() < MAX_ORPHAN_SIZE { if orphans.len() < MAX_ORPHAN_SIZE {
break; break;
} }
@@ -102,6 +102,10 @@ impl OrphanBlockPool {
fn remove_by_height(&self, height: &u64) -> Option<Vec<Orphan>> { fn remove_by_height(&self, height: &u64) -> Option<Vec<Orphan>> {
let mut orphans = self.orphans.write().unwrap(); let mut orphans = self.orphans.write().unwrap();
let mut height_idx = self.height_idx.write().unwrap(); let mut height_idx = self.height_idx.write().unwrap();
self.remove_by_height_nolock(height)
}
fn remove_by_height_nolock(&self, height: &u64) -> Option<Vec<Orphan>> {
height_idx height_idx
.remove(height) .remove(height)
.map(|hs| hs.iter().filter_map(|h| orphans.remove(h)).collect()) .map(|hs| hs.iter().filter_map(|h| orphans.remove(h)).collect())