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

[thin_check (rust)] Rename ValueType trait to Unpack

Browse Source
This commit is contained in:
Joe Thornber
2020-08-05 08:01:02 +01:00
parent 1d44025584
commit 197e4ffbfd
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/thin/check.rs
View File

@@ -8,7 +8,7 @@ use std::time::Instant;
use threadpool::ThreadPool;
use crate::block_manager::{AsyncIoEngine, Block, IoEngine};
use crate::pdata::btree::{BTreeWalker, Node, NodeVisitor, ValueType};
use crate::pdata::btree::{BTreeWalker, Node, NodeVisitor, Unpack};
use crate::thin::superblock::*;
//------------------------------------------
@@ -18,7 +18,7 @@ struct TopLevelVisitor<'a> {
}
impl<'a> NodeVisitor<u64> for TopLevelVisitor<'a> {
fn visit(&mut self, w: &BTreeWalker, _b: &Block, node: &Node<u64>) -> Result<()> {
fn visit(&mut self, _w: &BTreeWalker, _b: &Block, node: &Node<u64>) -> Result<()> {
if let Node::Leaf {
header: _h,
keys,
@@ -44,7 +44,7 @@ struct BlockTime {
time: u32,
}
impl ValueType for BlockTime {
impl Unpack for BlockTime {
fn disk_size() -> u32 {
8
}
@@ -82,7 +82,7 @@ struct DeviceDetail {
snapshotted_time: u32,
}
impl ValueType for DeviceDetail {
impl Unpack for DeviceDetail {
fn disk_size() -> u32 {
24
}
@@ -139,8 +139,7 @@ impl NodeVisitor<DeviceDetail> for DeviceVisitor {
//------------------------------------------
pub fn check(dev: &Path) -> Result<()> {
//let mut engine = SyncIoEngine::new(dev)?;
let mut engine = Arc::new(AsyncIoEngine::new(dev, 256)?);
let engine = Arc::new(AsyncIoEngine::new(dev, 256)?);
let now = Instant::now();
let sb = read_superblock(engine.as_ref(), SUPERBLOCK_LOCATION)?;
@@ -165,7 +164,7 @@ pub fn check(dev: &Path) -> Result<()> {
{
let nr_workers = 4;
let pool = ThreadPool::new(nr_workers);
let mut seen = Arc::new(Mutex::new(FixedBitSet::with_capacity(
let seen = Arc::new(Mutex::new(FixedBitSet::with_capacity(
engine.get_nr_blocks() as usize,
)));