diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-04 22:06:01 -0500 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-04 23:33:30 -0500 |
commit | 7709585c2afad361e0e3d699e40967f093eacbfa (patch) | |
tree | fd06afe182979bbd5237f447391271cace9850c7 /rust-src/bch_bindgen/src/btree.rs | |
parent | b0c9ad15f4e5cee60973a8f5f6dc49acfeec9755 (diff) |
rust: Implement BtreeNodeIter
This implements BtreeNodeIter, and adds it to cmd_list.rs - the next
step in having a full replacement for cmd_list.c
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'rust-src/bch_bindgen/src/btree.rs')
-rw-r--r-- | rust-src/bch_bindgen/src/btree.rs | 56 |
1 files changed, 55 insertions, 1 deletions
diff --git a/rust-src/bch_bindgen/src/btree.rs b/rust-src/bch_bindgen/src/btree.rs index c6d2fec2..7e748f9f 100644 --- a/rust-src/bch_bindgen/src/btree.rs +++ b/rust-src/bch_bindgen/src/btree.rs @@ -63,7 +63,7 @@ impl<'t> BtreeIter<'t> { c::bch2_trans_iter_init_outlined( ptr::addr_of!(trans.raw).cast_mut(), - &mut (*iter.as_mut_ptr()), + iter.as_mut_ptr(), btree as u32, pos, flags.bits as u32); @@ -105,3 +105,57 @@ impl<'t> Drop for BtreeIter<'t> { 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>>, +} + +impl<'t> BtreeNodeIter<'t> { + pub fn new(trans: &'t BtreeTrans<'t>, + btree: c::btree_id, + pos: c::bpos, + locks_want: u32, + depth: u32, + flags: BtreeIterFlags) -> BtreeNodeIter { + unsafe { + let mut iter: MaybeUninit<c::btree_iter> = MaybeUninit::uninit(); + c::bch2_trans_node_iter_init( + ptr::addr_of!(trans.raw).cast_mut(), + iter.as_mut_ptr(), + btree, + pos, + locks_want, + depth, + flags.bits as u32); + + BtreeNodeIter { raw: iter.assume_init(), trans: PhantomData } + } + } + + pub fn peek<'i>(&'i mut self) -> Result<Option<&'i c::btree>, bch_errcode> { + unsafe { + let b = c::bch2_btree_iter_peek_node(&mut self.raw); + errptr_to_result_c(b).map(|b| if !b.is_null() { Some(&*b) } else { None }) + } + } + + pub fn advance<'i>(&'i mut self) { + unsafe { + c::bch2_btree_iter_next_node(&mut self.raw); + } + } + + pub fn next<'i>(&'i mut self) -> Result<Option<&'i c::btree>, bch_errcode> { + unsafe { + let b = c::bch2_btree_iter_next_node(&mut self.raw); + errptr_to_result_c(b).map(|b| if !b.is_null() { Some(&*b) } else { None }) + } + } +} + +impl<'t> Drop for BtreeNodeIter<'t> { + fn drop(&mut self) { + unsafe { c::bch2_trans_iter_exit(self.raw.trans, &mut self.raw) } + } +} |