cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Make fork choice write lock in to read lock

Browse Source
This commit is contained in:
Paul Hauner 2019-08-10 17:19:27 +10:00
parent 64a6e1475c
commit 0d4b58978c
No known key found for this signature in database
GPG Key ID: 303E4494BB28068C
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eth2/lmd_ghost/src/reduced_tree.rs
View File

@ -111,7 +111,7 @@ where
} }
fn latest_message(&self, validator_index: usize) -> Option<(Hash256, Slot)> { fn latest_message(&self, validator_index: usize) -> Option<(Hash256, Slot)> {
self.core.write().latest_message(validator_index) self.core.read().latest_message(validator_index)
} }
} }
@ -258,10 +258,10 @@ where
Ok(head_node.block_hash) Ok(head_node.block_hash)
} }
pub fn latest_message(&mut self, validator_index: usize) -> Option<(Hash256, Slot)> { pub fn latest_message(&self, validator_index: usize) -> Option<(Hash256, Slot)> {
match self.latest_votes.get(validator_index) { match self.latest_votes.get_ref(validator_index) {
Some(v) => Some((v.hash.clone(), v.slot.clone())), Some(Some(v)) => Some((v.hash.clone(), v.slot.clone())),
None => None, _ => None,
} }
} }
@ -776,6 +776,14 @@ where
&self.0[i] &self.0[i]
} }
pub fn get_ref(&self, i: usize) -> Option<&T> {
if i < self.0.len() {
Some(&self.0[i])
} else {
None
}
}
pub fn insert(&mut self, i: usize, element: T) { pub fn insert(&mut self, i: usize, element: T) {
self.ensure(i); self.ensure(i);
self.0[i] = element; self.0[i] = element;