emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[thin_check (rust)] Make NodeVisitor::visit non mut.

Browse Source 
Preparation for making btree_walk multithreaded
This commit is contained in:
Joe Thornber 2020-08-20 11:05:14 +01:00
parent a1c206b774
commit 2cc2dffab5
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pdata/btree.rs
View File

@ -147,7 +147,8 @@ pub fn unpack_node<V: Unpack>(
//------------------------------------------ //------------------------------------------
pub trait NodeVisitor<V: Unpack> { pub trait NodeVisitor<V: Unpack> {
fn visit(&mut self, header: &NodeHeader, keys: &[u64], values: &[V]) -> Result<()>; // &self is deliberately non mut to allow the walker to use multiple threads.
fn visit(&self, header: &NodeHeader, keys: &[u64], values: &[V]) -> Result<()>;
} }
#[derive(Clone)] #[derive(Clone)]
@ -274,23 +275,22 @@ impl BTreeWalker {
//------------------------------------------ //------------------------------------------
struct ValueCollector<V> { struct ValueCollector<V> {
values: BTreeMap<u64, V>, values: Mutex<BTreeMap<u64, V>>,
} }
impl<V> ValueCollector<V> { impl<V> ValueCollector<V> {
fn new() -> ValueCollector<V> { fn new() -> ValueCollector<V> {
ValueCollector { ValueCollector {
values: BTreeMap::new(), values: Mutex::new(BTreeMap::new()),
} }
} }
} }
impl<V: Unpack + Clone> NodeVisitor<V> for ValueCollector<V> { impl<V: Unpack + Clone> NodeVisitor<V> for ValueCollector<V> {
fn visit(&mut self, _h: &NodeHeader, keys: &[u64], values: &[V]) -> Result<()> { fn visit(&self, _h: &NodeHeader, keys: &[u64], values: &[V]) -> Result<()> {
let mut vals = self.values.lock().unwrap();
for n in 0..keys.len() { for n in 0..keys.len() {
let k = keys[n]; vals.insert(keys[n], values[n].clone());
let v = values[n].clone();
self.values.insert(k, v);
} }
Ok(()) Ok(())
@ -306,7 +306,7 @@ pub fn btree_to_map<V: Unpack + Clone>(
let mut visitor = ValueCollector::<V>::new(); let mut visitor = ValueCollector::<V>::new();
walker.walk(&mut visitor, root)?; walker.walk(&mut visitor, root)?;
Ok(visitor.values) Ok(visitor.values.into_inner().unwrap())
} }
pub fn btree_to_map_with_sm<V: Unpack + Clone>( pub fn btree_to_map_with_sm<V: Unpack + Clone>(
@ -319,7 +319,7 @@ pub fn btree_to_map_with_sm<V: Unpack + Clone>(
let mut visitor = ValueCollector::<V>::new(); let mut visitor = ValueCollector::<V>::new();
walker.walk(&mut visitor, root)?; walker.walk(&mut visitor, root)?;
Ok(visitor.values) Ok(visitor.values.into_inner().unwrap())
} }
//------------------------------------------ //------------------------------------------

4
src/thin/check.rs
View File

@ -50,7 +50,7 @@ struct BottomLevelVisitor {
//------------------------------------------ //------------------------------------------
impl NodeVisitor<BlockTime> for BottomLevelVisitor { impl NodeVisitor<BlockTime> for BottomLevelVisitor {
fn visit(&mut self, _h: &NodeHeader, _k: &[u64], values: &[BlockTime]) -> Result<()> { fn visit(&self, _h: &NodeHeader, _k: &[u64], values: &[BlockTime]) -> Result<()> {
// FIXME: do other checks // FIXME: do other checks
if values.len() == 0 { if values.len() == 0 {
@ -124,7 +124,7 @@ impl<'a> OverflowChecker<'a> {
} }
impl<'a> NodeVisitor<u32> for OverflowChecker<'a> { impl<'a> NodeVisitor<u32> for OverflowChecker<'a> {
fn visit(&mut self, _h: &NodeHeader, keys: &[u64], values: &[u32]) -> Result<()> { fn visit(&self, _h: &NodeHeader, keys: &[u64], values: &[u32]) -> Result<()> {
for n in 0..keys.len() { for n in 0..keys.len() {
let k = keys[n]; let k = keys[n];
let v = values[n]; let v = values[n];