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

AcctIdx: remove duplicate mmap creation (#20453)

This commit is contained in:
Jeff Washington (jwash) 2021-10-05 19:58:25 -05:00 committed by GitHub
parent 6ea96b3274
commit 18e47ab9f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bucket_map/src/bucket_storage.rs
View File

@ -57,7 +57,6 @@ impl Header {
} }
pub struct BucketStorage { pub struct BucketStorage {
drives: Arc<Vec<PathBuf>>,
path: PathBuf, path: PathBuf,
mmap: MmapMut, mmap: MmapMut,
pub cell_size: u64, pub cell_size: u64,
@ -92,7 +91,6 @@ impl BucketStorage {
Self { Self {
path, path,
mmap, mmap,
drives,
cell_size, cell_size,
used: AtomicU64::new(0), used: AtomicU64::new(0),
capacity_pow2, capacity_pow2,
@ -305,18 +303,12 @@ impl BucketStorage {
let old_cap = old_bucket.capacity(); let old_cap = old_bucket.capacity();
let old_map = &old_bucket.mmap; let old_map = &old_bucket.mmap;
let increment = 1; let increment = self.capacity_pow2 - old_bucket.capacity_pow2;
let index_grow = 1 << increment; let index_grow = 1 << increment;
let (new_map, new_file) = Self::new_map(
&old_bucket.drives,
old_bucket.cell_size as usize,
old_bucket.capacity_pow2 + increment,
&old_bucket.stats,
);
(0..old_cap as usize).into_iter().for_each(|i| { (0..old_cap as usize).into_iter().for_each(|i| {
let old_ix = i * old_bucket.cell_size as usize; let old_ix = i * old_bucket.cell_size as usize;
let new_ix = old_ix * index_grow; let new_ix = old_ix * index_grow;
let dst_slice: &[u8] = &new_map[new_ix..new_ix + old_bucket.cell_size as usize]; let dst_slice: &[u8] = &self.mmap[new_ix..new_ix + old_bucket.cell_size as usize];
let src_slice: &[u8] = &old_map[old_ix..old_ix + old_bucket.cell_size as usize]; let src_slice: &[u8] = &old_map[old_ix..old_ix + old_bucket.cell_size as usize];
unsafe { unsafe {
@ -325,8 +317,6 @@ impl BucketStorage {
std::ptr::copy_nonoverlapping(src, dst, old_bucket.cell_size as usize); std::ptr::copy_nonoverlapping(src, dst, old_bucket.cell_size as usize);
}; };
}); });
self.mmap = new_map;
self.path = new_file;
m.stop(); m.stop();
self.stats.resizes.fetch_add(1, Ordering::Relaxed); self.stats.resizes.fetch_add(1, Ordering::Relaxed);
self.stats.resize_us.fetch_add(m.as_us(), Ordering::Relaxed); self.stats.resize_us.fetch_add(m.as_us(), Ordering::Relaxed);