diff options
Diffstat (limited to 'bch_bindgen')
-rw-r--r-- | bch_bindgen/build.rs | 3 | ||||
-rw-r--r-- | bch_bindgen/rustfmt.toml | 3 | ||||
-rw-r--r-- | bch_bindgen/src/bkey.rs | 93 | ||||
-rw-r--r-- | bch_bindgen/src/btree.rs | 108 | ||||
-rw-r--r-- | bch_bindgen/src/fs.rs | 11 | ||||
-rw-r--r-- | bch_bindgen/src/lib.rs | 72 | ||||
-rw-r--r-- | bch_bindgen/src/sb_io.rs | 11 |
7 files changed, 184 insertions, 117 deletions
diff --git a/bch_bindgen/build.rs b/bch_bindgen/build.rs index 0329f1ae..4a3755a1 100644 --- a/bch_bindgen/build.rs +++ b/bch_bindgen/build.rs @@ -29,8 +29,7 @@ fn main() { .to_string(), ) .clang_args( - urcu - .include_paths + urcu.include_paths .iter() .map(|p| format!("-I{}", p.display())), ) diff --git a/bch_bindgen/rustfmt.toml b/bch_bindgen/rustfmt.toml deleted file mode 100644 index 42f2ad7c..00000000 --- a/bch_bindgen/rustfmt.toml +++ /dev/null @@ -1,3 +0,0 @@ -# Default settings, i.e. idiomatic rust -edition = "2021" -newline_style = "Unix"
\ No newline at end of file diff --git a/bch_bindgen/src/bkey.rs b/bch_bindgen/src/bkey.rs index 258e2434..b9cab4a1 100644 --- a/bch_bindgen/src/bkey.rs +++ b/bch_bindgen/src/bkey.rs @@ -1,17 +1,17 @@ #![allow(non_camel_case_types)] +use crate::btree::BtreeIter; use crate::c; use crate::fs::Fs; -use crate::btree::BtreeIter; use crate::printbuf_to_formatter; use std::fmt; use std::marker::PhantomData; use std::mem::transmute; pub struct BkeySC<'a> { - pub k: &'a c::bkey, - pub v: &'a c::bch_val, - pub(crate) iter: PhantomData<&'a mut BtreeIter<'a>> + pub k: &'a c::bkey, + pub v: &'a c::bch_val, + pub(crate) iter: PhantomData<&'a mut BtreeIter<'a>>, } pub enum BkeyValC<'a> { @@ -53,7 +53,10 @@ pub enum BkeyValC<'a> { impl<'a, 'b> BkeySC<'a> { unsafe fn to_raw(&self) -> c::bkey_s_c { - c::bkey_s_c { k: self.k, v: self.v } + c::bkey_s_c { + k: self.k, + v: self.v, + } } pub fn to_text(&'a self, fs: &'b Fs) -> BkeySCToText<'a, 'b> { @@ -67,41 +70,41 @@ impl<'a, 'b> BkeySC<'a> { use c::bch_bkey_type::*; use BkeyValC::*; match ty { - KEY_TYPE_deleted => deleted, - KEY_TYPE_whiteout => whiteout, - KEY_TYPE_error => error, - KEY_TYPE_cookie => cookie(transmute(self.v)), - KEY_TYPE_hash_whiteout => hash_whiteout(transmute(self.v)), - KEY_TYPE_btree_ptr => btree_ptr(transmute(self.v)), - KEY_TYPE_extent => extent(transmute(self.v)), - KEY_TYPE_reservation => reservation(transmute(self.v)), - KEY_TYPE_inode => inode(transmute(self.v)), - KEY_TYPE_inode_generation => inode_generation(transmute(self.v)), - KEY_TYPE_dirent => dirent(transmute(self.v)), - KEY_TYPE_xattr => xattr(transmute(self.v)), - KEY_TYPE_alloc => alloc(transmute(self.v)), - KEY_TYPE_quota => quota(transmute(self.v)), - KEY_TYPE_stripe => stripe(transmute(self.v)), - KEY_TYPE_reflink_p => reflink_p(transmute(self.v)), - KEY_TYPE_reflink_v => reflink_v(transmute(self.v)), - KEY_TYPE_inline_data => inline_data(transmute(self.v)), - KEY_TYPE_btree_ptr_v2 => btree_ptr_v2(transmute(self.v)), - KEY_TYPE_indirect_inline_data => indirect_inline_data(transmute(self.v)), - KEY_TYPE_alloc_v2 => alloc_v2(transmute(self.v)), - KEY_TYPE_subvolume => subvolume(transmute(self.v)), - KEY_TYPE_snapshot => snapshot(transmute(self.v)), - KEY_TYPE_inode_v2 => inode_v2(transmute(self.v)), - KEY_TYPE_alloc_v3 => inode_v3(transmute(self.v)), - KEY_TYPE_set => set, - KEY_TYPE_lru => lru(transmute(self.v)), - KEY_TYPE_alloc_v4 => alloc_v4(transmute(self.v)), - KEY_TYPE_backpointer => backpointer(transmute(self.v)), - KEY_TYPE_inode_v3 => inode_v3(transmute(self.v)), - KEY_TYPE_bucket_gens => bucket_gens(transmute(self.v)), - KEY_TYPE_snapshot_tree => snapshot_tree(transmute(self.v)), - KEY_TYPE_logged_op_truncate => logged_op_truncate(transmute(self.v)), - KEY_TYPE_logged_op_finsert => logged_op_finsert(transmute(self.v)), - KEY_TYPE_MAX => unreachable!(), + KEY_TYPE_deleted => deleted, + KEY_TYPE_whiteout => whiteout, + KEY_TYPE_error => error, + KEY_TYPE_cookie => cookie(transmute(self.v)), + KEY_TYPE_hash_whiteout => hash_whiteout(transmute(self.v)), + KEY_TYPE_btree_ptr => btree_ptr(transmute(self.v)), + KEY_TYPE_extent => extent(transmute(self.v)), + KEY_TYPE_reservation => reservation(transmute(self.v)), + KEY_TYPE_inode => inode(transmute(self.v)), + KEY_TYPE_inode_generation => inode_generation(transmute(self.v)), + KEY_TYPE_dirent => dirent(transmute(self.v)), + KEY_TYPE_xattr => xattr(transmute(self.v)), + KEY_TYPE_alloc => alloc(transmute(self.v)), + KEY_TYPE_quota => quota(transmute(self.v)), + KEY_TYPE_stripe => stripe(transmute(self.v)), + KEY_TYPE_reflink_p => reflink_p(transmute(self.v)), + KEY_TYPE_reflink_v => reflink_v(transmute(self.v)), + KEY_TYPE_inline_data => inline_data(transmute(self.v)), + KEY_TYPE_btree_ptr_v2 => btree_ptr_v2(transmute(self.v)), + KEY_TYPE_indirect_inline_data => indirect_inline_data(transmute(self.v)), + KEY_TYPE_alloc_v2 => alloc_v2(transmute(self.v)), + KEY_TYPE_subvolume => subvolume(transmute(self.v)), + KEY_TYPE_snapshot => snapshot(transmute(self.v)), + KEY_TYPE_inode_v2 => inode_v2(transmute(self.v)), + KEY_TYPE_alloc_v3 => inode_v3(transmute(self.v)), + KEY_TYPE_set => set, + KEY_TYPE_lru => lru(transmute(self.v)), + KEY_TYPE_alloc_v4 => alloc_v4(transmute(self.v)), + KEY_TYPE_backpointer => backpointer(transmute(self.v)), + KEY_TYPE_inode_v3 => inode_v3(transmute(self.v)), + KEY_TYPE_bucket_gens => bucket_gens(transmute(self.v)), + KEY_TYPE_snapshot_tree => snapshot_tree(transmute(self.v)), + KEY_TYPE_logged_op_truncate => logged_op_truncate(transmute(self.v)), + KEY_TYPE_logged_op_finsert => logged_op_finsert(transmute(self.v)), + KEY_TYPE_MAX => unreachable!(), } } } @@ -109,7 +112,11 @@ impl<'a, 'b> BkeySC<'a> { impl<'a> From<&'a c::bkey_i> for BkeySC<'a> { fn from(k: &'a c::bkey_i) -> Self { - BkeySC { k: &k.k, v: &k.v, iter: PhantomData } + BkeySC { + k: &k.k, + v: &k.v, + iter: PhantomData, + } } } @@ -121,7 +128,9 @@ pub struct BkeySCToText<'a, 'b> { impl<'a, 'b> fmt::Display for BkeySCToText<'a, 'b> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { unsafe { - printbuf_to_formatter(f, |buf| c::bch2_bkey_val_to_text(buf, self.fs.raw, self.k.to_raw())) + printbuf_to_formatter(f, |buf| { + c::bch2_bkey_val_to_text(buf, self.fs.raw, self.k.to_raw()) + }) } } } diff --git a/bch_bindgen/src/btree.rs b/bch_bindgen/src/btree.rs index 142e9614..ba3ec87c 100644 --- a/bch_bindgen/src/btree.rs +++ b/bch_bindgen/src/btree.rs @@ -1,23 +1,26 @@ -use crate::SPOS_MAX; -use crate::c; use crate::bkey::BkeySC; -use crate::fs::Fs; +use crate::c; use crate::errcode::{bch_errcode, errptr_to_result_c}; +use crate::fs::Fs; use crate::printbuf_to_formatter; +use crate::SPOS_MAX; +use bitflags::bitflags; use std::fmt; use std::marker::PhantomData; use std::mem::MaybeUninit; -use bitflags::bitflags; pub struct BtreeTrans<'f> { - raw: *mut c::btree_trans, - fs: PhantomData<&'f Fs> + raw: *mut c::btree_trans, + fs: PhantomData<&'f Fs>, } impl<'f> BtreeTrans<'f> { pub fn new(fs: &'f Fs) -> BtreeTrans { unsafe { - BtreeTrans { raw: &mut *c::__bch2_trans_get(fs.raw, 0), fs: PhantomData } + BtreeTrans { + raw: &mut *c::__bch2_trans_get(fs.raw, 0), + fs: PhantomData, + } } } } @@ -25,7 +28,7 @@ impl<'f> BtreeTrans<'f> { impl<'f> Drop for BtreeTrans<'f> { fn drop(&mut self) { unsafe { c::bch2_trans_put(&mut *self.raw) } - } + } } bitflags! { @@ -49,12 +52,17 @@ bitflags! { } pub struct BtreeIter<'t> { - raw: c::btree_iter, - trans: PhantomData<&'t BtreeTrans<'t>>, + raw: c::btree_iter, + trans: PhantomData<&'t BtreeTrans<'t>>, } impl<'t> BtreeIter<'t> { - pub fn new(trans: &'t BtreeTrans<'t>, btree: c::btree_id, pos: c::bpos, flags: BtreeIterFlags) -> BtreeIter<'t> { + pub fn new( + trans: &'t BtreeTrans<'t>, + btree: c::btree_id, + pos: c::bpos, + flags: BtreeIterFlags, + ) -> BtreeIter<'t> { unsafe { let mut iter: MaybeUninit<c::btree_iter> = MaybeUninit::uninit(); @@ -63,17 +71,30 @@ impl<'t> BtreeIter<'t> { iter.as_mut_ptr(), btree, pos, - flags.bits as u32); + flags.bits as u32, + ); - BtreeIter { raw: iter.assume_init(), trans: PhantomData } + BtreeIter { + raw: iter.assume_init(), + trans: PhantomData, + } } } pub fn peek_upto<'i>(&'i mut self, end: c::bpos) -> Result<Option<BkeySC>, bch_errcode> { unsafe { let k = c::bch2_btree_iter_peek_upto(&mut self.raw, end); - errptr_to_result_c(k.k) - .map(|_| if !k.k.is_null() { Some(BkeySC { k: &*k.k, v: &*k.v, iter: PhantomData }) } else { None } ) + errptr_to_result_c(k.k).map(|_| { + if !k.k.is_null() { + Some(BkeySC { + k: &*k.k, + v: &*k.v, + iter: PhantomData, + }) + } else { + None + } + }) } } @@ -85,8 +106,17 @@ impl<'t> BtreeIter<'t> { unsafe { let k = c::bch2_btree_iter_peek_and_restart_outlined(&mut self.raw); - errptr_to_result_c(k.k) - .map(|_| if !k.k.is_null() { Some(BkeySC{ k: &*k.k, v: &*k.v, iter: PhantomData }) } else { None } ) + errptr_to_result_c(k.k).map(|_| { + if !k.k.is_null() { + Some(BkeySC { + k: &*k.k, + v: &*k.v, + iter: PhantomData, + }) + } else { + None + } + }) } } @@ -100,21 +130,23 @@ impl<'t> BtreeIter<'t> { impl<'t> Drop for BtreeIter<'t> { fn drop(&mut self) { unsafe { c::bch2_trans_iter_exit(self.raw.trans, &mut self.raw) } - } + } } pub struct BtreeNodeIter<'t> { - raw: c::btree_iter, - trans: PhantomData<&'t BtreeTrans<'t>>, + raw: c::btree_iter, + trans: PhantomData<&'t BtreeTrans<'t>>, } impl<'t> BtreeNodeIter<'t> { - pub fn new(trans: &'t BtreeTrans<'t>, - btree: c::btree_id, - pos: c::bpos, + pub fn new( + trans: &'t BtreeTrans<'t>, + btree: c::btree_id, + pos: c::bpos, locks_want: u32, - depth: u32, - flags: BtreeIterFlags) -> BtreeNodeIter { + depth: u32, + flags: BtreeIterFlags, + ) -> BtreeNodeIter { unsafe { let mut iter: MaybeUninit<c::btree_iter> = MaybeUninit::uninit(); c::bch2_trans_node_iter_init( @@ -124,9 +156,13 @@ impl<'t> BtreeNodeIter<'t> { pos, locks_want, depth, - flags.bits as u32); + flags.bits as u32, + ); - BtreeNodeIter { raw: iter.assume_init(), trans: PhantomData } + BtreeNodeIter { + raw: iter.assume_init(), + trans: PhantomData, + } } } @@ -161,7 +197,7 @@ impl<'t> BtreeNodeIter<'t> { impl<'t> Drop for BtreeNodeIter<'t> { fn drop(&mut self) { unsafe { c::bch2_trans_iter_exit(self.raw.trans, &mut self.raw) } - } + } } impl<'b, 'f> c::btree { @@ -175,23 +211,27 @@ impl<'b, 'f> c::btree { } pub struct BtreeNodeToText<'b, 'f> { - b: &'b c::btree, - fs: &'f Fs, + b: &'b c::btree, + fs: &'f Fs, } impl<'b, 'f> fmt::Display for BtreeNodeToText<'b, 'f> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - printbuf_to_formatter(f, |buf| unsafe { c::bch2_btree_node_to_text(buf, self.fs.raw, self.b) }) + printbuf_to_formatter(f, |buf| unsafe { + c::bch2_btree_node_to_text(buf, self.fs.raw, self.b) + }) } } pub struct BtreeNodeOndiskToText<'b, 'f> { - b: &'b c::btree, - fs: &'f Fs, + b: &'b c::btree, + fs: &'f Fs, } impl<'b, 'f> fmt::Display for BtreeNodeOndiskToText<'b, 'f> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - printbuf_to_formatter(f, |buf| unsafe { c::bch2_btree_node_ondisk_to_text(buf, self.fs.raw, self.b) }) + printbuf_to_formatter(f, |buf| unsafe { + c::bch2_btree_node_ondisk_to_text(buf, self.fs.raw, self.b) + }) } } diff --git a/bch_bindgen/src/fs.rs b/bch_bindgen/src/fs.rs index b26c51b6..e44fca25 100644 --- a/bch_bindgen/src/fs.rs +++ b/bch_bindgen/src/fs.rs @@ -1,8 +1,8 @@ +use crate::c; +use crate::errcode::{bch_errcode, errptr_to_result}; use std::ffi::CString; use std::os::unix::ffi::OsStrExt; use std::path::PathBuf; -use crate::c; -use crate::errcode::{bch_errcode, errptr_to_result}; pub struct Fs { pub raw: *mut c::bch_fs, @@ -10,18 +10,19 @@ pub struct Fs { impl Fs { pub fn open(devs: &Vec<PathBuf>, opts: c::bch_opts) -> Result<Fs, bch_errcode> { - let devs: Vec<_> = devs.iter() + let devs: Vec<_> = devs + .iter() .map(|i| CString::new(i.as_os_str().as_bytes()).unwrap().into_raw()) .collect(); let ret = unsafe { c::bch2_fs_open(devs[..].as_ptr(), devs.len() as u32, opts) }; - errptr_to_result(ret).map(|fs| Fs { raw: fs}) + errptr_to_result(ret).map(|fs| Fs { raw: fs }) } } impl Drop for Fs { fn drop(&mut self) { unsafe { c::bch2_fs_stop(self.raw) } - } + } } diff --git a/bch_bindgen/src/lib.rs b/bch_bindgen/src/lib.rs index b31b1a61..b68f2d9b 100644 --- a/bch_bindgen/src/lib.rs +++ b/bch_bindgen/src/lib.rs @@ -1,11 +1,11 @@ pub mod bcachefs; -pub mod btree; pub mod bkey; +pub mod btree; pub mod errcode; -pub mod keyutils; -pub mod sb_io; pub mod fs; +pub mod keyutils; pub mod opts; +pub mod sb_io; pub use paste::paste; pub mod c { @@ -15,15 +15,19 @@ pub mod c { use c::bpos as Bpos; pub const fn spos(inode: u64, offset: u64, snapshot: u32) -> Bpos { - Bpos { inode, offset, snapshot } + Bpos { + inode, + offset, + snapshot, + } } pub const fn pos(inode: u64, offset: u64) -> Bpos { spos(inode, offset, 0) } -pub const POS_MIN: Bpos = spos(0, 0, 0); -pub const POS_MAX: Bpos = spos(u64::MAX, u64::MAX, 0); +pub const POS_MIN: Bpos = spos(0, 0, 0); +pub const POS_MAX: Bpos = spos(u64::MAX, u64::MAX, 0); pub const SPOS_MAX: Bpos = spos(u64::MAX, u64::MAX, u32::MAX); use std::cmp::Ordering; @@ -44,14 +48,15 @@ impl PartialOrd for Bpos { impl Ord for Bpos { fn cmp(&self, other: &Self) -> Ordering { - let l_inode = self.inode; - let r_inode = other.inode; - let l_offset = self.offset; - let r_offset = other.offset; - let l_snapshot = self.snapshot; - let r_snapshot = other.snapshot; - - l_inode.cmp(&r_inode) + let l_inode = self.inode; + let r_inode = other.inode; + let l_offset = self.offset; + let r_offset = other.offset; + let l_snapshot = self.snapshot; + let r_snapshot = other.snapshot; + + l_inode + .cmp(&r_inode) .then(l_offset.cmp(&r_offset)) .then(l_snapshot.cmp(&r_snapshot)) } @@ -68,9 +73,9 @@ impl fmt::Display for c::btree_id { } } -use std::str::FromStr; use std::ffi::CString; -use std::{path::Path,os::unix::ffi::OsStrExt}; +use std::str::FromStr; +use std::{os::unix::ffi::OsStrExt, path::Path}; pub fn path_to_cstr<P: AsRef<Path>>(p: P) -> CString { CString::new(p.as_ref().as_os_str().as_bytes()).unwrap() @@ -95,8 +100,7 @@ impl fmt::Display for BchToolsErr { } } -impl Error for BchToolsErr { -} +impl Error for BchToolsErr {} impl FromStr for c::btree_id { type Err = BchToolsErr; @@ -105,7 +109,13 @@ impl FromStr for c::btree_id { let s = CString::new(s).unwrap(); let p = s.as_ptr(); - let v = unsafe {c::match_string(c::__bch2_btree_ids[..].as_ptr(), (-(1 as isize)) as usize, p)}; + let v = unsafe { + c::match_string( + c::__bch2_btree_ids[..].as_ptr(), + (-(1 as isize)) as usize, + p, + ) + }; if v >= 0 { Ok(unsafe { std::mem::transmute(v) }) } else { @@ -121,7 +131,9 @@ impl FromStr for c::bch_bkey_type { let s = CString::new(s).unwrap(); let p = s.as_ptr(); - let v = unsafe {c::match_string(c::bch2_bkey_types[..].as_ptr(), (-(1 as isize)) as usize, p)}; + let v = unsafe { + c::match_string(c::bch2_bkey_types[..].as_ptr(), (-(1 as isize)) as usize, p) + }; if v >= 0 { Ok(unsafe { std::mem::transmute(v) }) } else { @@ -142,7 +154,7 @@ impl c::printbuf { impl Drop for c::printbuf { fn drop(&mut self) { unsafe { c::bch2_printbuf_exit(self) } - } + } } impl fmt::Display for Bpos { @@ -150,7 +162,7 @@ impl fmt::Display for Bpos { let mut buf = c::printbuf::new(); unsafe { c::bch2_bpos_to_text(&mut buf, *self) }; - + let s = unsafe { CStr::from_ptr(buf.buf) }; let s = s.to_str().unwrap(); write!(f, "{}", s) @@ -178,16 +190,22 @@ impl FromStr for c::bpos { let off_str = fields.next().ok_or(BchToolsErr::InvalidBpos)?; let snp_str = fields.next(); - let ino: u64 = ino_str.parse().map_err(|_| BchToolsErr::InvalidBpos)?; - let off: u64 = off_str.parse().map_err(|_| BchToolsErr::InvalidBpos)?; - let snp: u32 = snp_str.map(|s| s.parse().ok()).flatten().unwrap_or(0); + let ino: u64 = ino_str.parse().map_err(|_| BchToolsErr::InvalidBpos)?; + let off: u64 = off_str.parse().map_err(|_| BchToolsErr::InvalidBpos)?; + let snp: u32 = snp_str.map(|s| s.parse().ok()).flatten().unwrap_or(0); - Ok(c::bpos { inode: ino, offset: off, snapshot: snp }) + Ok(c::bpos { + inode: ino, + offset: off, + snapshot: snp, + }) } } pub fn printbuf_to_formatter<F>(f: &mut fmt::Formatter<'_>, func: F) -> fmt::Result - where F: Fn(*mut c::printbuf) { +where + F: Fn(*mut c::printbuf), +{ let mut buf = c::printbuf::new(); func(&mut buf); diff --git a/bch_bindgen/src/sb_io.rs b/bch_bindgen/src/sb_io.rs index 44278f85..7537560b 100644 --- a/bch_bindgen/src/sb_io.rs +++ b/bch_bindgen/src/sb_io.rs @@ -1,8 +1,8 @@ -use anyhow::anyhow; -use crate::path_to_cstr; use crate::bcachefs; use crate::bcachefs::*; use crate::errcode::bch_errcode; +use crate::path_to_cstr; +use anyhow::anyhow; pub fn read_super_opts( path: &std::path::Path, @@ -11,7 +11,8 @@ pub fn read_super_opts( let path = path_to_cstr(path); let mut sb = std::mem::MaybeUninit::zeroed(); - let ret = unsafe { crate::bcachefs::bch2_read_super(path.as_ptr(), &mut opts, sb.as_mut_ptr()) }; + let ret = + unsafe { crate::bcachefs::bch2_read_super(path.as_ptr(), &mut opts, sb.as_mut_ptr()) }; if ret != 0 { let err: bch_errcode = unsafe { ::std::mem::transmute(ret) }; @@ -33,7 +34,9 @@ pub fn read_super_silent( let path = path_to_cstr(path); let mut sb = std::mem::MaybeUninit::zeroed(); - let ret = unsafe { crate::bcachefs::bch2_read_super_silent(path.as_ptr(), &mut opts, sb.as_mut_ptr()) }; + let ret = unsafe { + crate::bcachefs::bch2_read_super_silent(path.as_ptr(), &mut opts, sb.as_mut_ptr()) + }; if ret != 0 { let err: bch_errcode = unsafe { ::std::mem::transmute(ret) }; |