Skip to content

Replace FragmentedMapper with TwoLevelMmapper #1337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Replace FragmentedMapper with TwoLevelMmapper #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fded673
Add MultiLevelMapper
wks Jul 9, 2025
c7cb998
Merge branch 'master' into feature/fragmented-mapper-no-hash
wks Jul 10, 2025
96c76bd
Rename MultiLevelMapper to MultiLevelMmapper
wks Jul 11, 2025
e54a28c
Completely remove FragmentedMapper
wks Jul 11, 2025
a212a6f
Adjust comment
wks Jul 11, 2025
461d5f4
Rename it again to TwoLevelMmapper
wks Jul 11, 2025
0b7330a
Minor comment change
wks Jul 11, 2025
8142983
Reimplement `slab_table` and `get_or_allocate_slab_table`
wks Jul 11, 2025
9332852
Comments on Relaxed order
wks Jul 11, 2025
98088c8
Only make TwoLevelMmapper available on 64-bit
wks Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/util/heap/layout/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ pub mod vm_layout;
mod mmapper;
pub use self::mmapper::Mmapper;
mod byte_map_mmapper;
// Only make `two_level_mapper` available on 64-bit architectures because it contains 64-bit `usize`
// constants that only work on 64-bit architectures.
#[cfg(target_pointer_width = "64")]
mod fragmented_mapper;
mod two_level_mmapper;

mod map;
pub(crate) use self::map::CreateFreeListResult;
Expand Down Expand Up @@ -37,7 +39,7 @@ pub fn create_mmapper() -> Box<dyn Mmapper + Send + Sync> {
#[cfg(target_pointer_width = "64")]
pub fn create_mmapper() -> Box<dyn Mmapper + Send + Sync> {
// TODO: ByteMapMmapper for 39-bit or less virtual space
Box::new(fragmented_mapper::FragmentedMapper::new())
Box::new(two_level_mmapper::TwoLevelMmapper::new())
}

use crate::util::Address;
Expand Down
Loading