blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bucket_map: Moves get_from_bytes() to index_entry.rs (#31443)

This commit is contained in:
Brooks 2023-05-02 12:58:16 -04:00 committed by GitHub
parent 9b6cadc102
commit 1a6c75a115
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bucket_map/src/bucket_storage.rs
View File

@ -289,18 +289,6 @@ impl<O: BucketOccupied> BucketStorage<O> {
unsafe { slice.get_unchecked_mut(0) } unsafe { slice.get_unchecked_mut(0) }
} }
pub(crate) fn get_mut_from_parts<T>(item_slice: &mut [u8]) -> &mut T {
debug_assert!(std::mem::size_of::<T>() <= item_slice.len());
let item = item_slice.as_mut_ptr() as *mut T;
unsafe { &mut *item }
}
pub(crate) fn get_from_parts<T>(item_slice: &[u8]) -> &T {
debug_assert!(std::mem::size_of::<T>() <= item_slice.len());
let item = item_slice.as_ptr() as *const T;
unsafe { &*item }
}
pub(crate) fn get_slice<T>(&self, ix: u64, len: u64, header: IncludeHeader) -> &[T] { pub(crate) fn get_slice<T>(&self, ix: u64, len: u64, header: IncludeHeader) -> &[T] {
let start = self.get_start_offset(ix, header); let start = self.get_start_offset(ix, header);
let slice = { let slice = {

21
bucket_map/src/index_entry.rs
View File

@ -46,19 +46,16 @@ pub struct BucketWithHeader {
impl BucketOccupied for BucketWithHeader { impl BucketOccupied for BucketWithHeader {
fn occupy(&mut self, element: &mut [u8], ix: usize) { fn occupy(&mut self, element: &mut [u8], ix: usize) {
assert!(self.is_free(element, ix)); assert!(self.is_free(element, ix));
let entry: &mut DataBucketRefCountOccupiedHeader = let entry = get_mut_from_bytes::<DataBucketRefCountOccupiedHeader>(element);
BucketStorage::<BucketWithHeader>::get_mut_from_parts(element);
entry.packed_ref_count.set_occupied(OCCUPIED_OCCUPIED); entry.packed_ref_count.set_occupied(OCCUPIED_OCCUPIED);
} }
fn free(&mut self, element: &mut [u8], ix: usize) { fn free(&mut self, element: &mut [u8], ix: usize) {
assert!(!self.is_free(element, ix)); assert!(!self.is_free(element, ix));
let entry: &mut DataBucketRefCountOccupiedHeader = let entry = get_mut_from_bytes::<DataBucketRefCountOccupiedHeader>(element);
BucketStorage::<BucketWithHeader>::get_mut_from_parts(element);
entry.packed_ref_count.set_occupied(OCCUPIED_FREE); entry.packed_ref_count.set_occupied(OCCUPIED_FREE);
} }
fn is_free(&self, element: &[u8], _ix: usize) -> bool { fn is_free(&self, element: &[u8], _ix: usize) -> bool {
let entry: &DataBucketRefCountOccupiedHeader = let entry = get_from_bytes::<DataBucketRefCountOccupiedHeader>(element);
BucketStorage::<BucketWithHeader>::get_from_parts(element);
entry.packed_ref_count.occupied() == OCCUPIED_FREE entry.packed_ref_count.occupied() == OCCUPIED_FREE
} }
fn offset_to_first_data() -> usize { fn offset_to_first_data() -> usize {
@ -426,6 +423,18 @@ impl<T: Copy + 'static> IndexEntryPlaceInBucket<T> {
} }
} }
fn get_from_bytes<T>(item_slice: &[u8]) -> &T {
debug_assert!(std::mem::size_of::<T>() <= item_slice.len());
let item = item_slice.as_ptr() as *const T;
unsafe { &*item }
}
fn get_mut_from_bytes<T>(item_slice: &mut [u8]) -> &mut T {
debug_assert!(std::mem::size_of::<T>() <= item_slice.len());
let item = item_slice.as_mut_ptr() as *mut T;
unsafe { &mut *item }
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;