Skip to content

Commit dea6e07

Browse files
chore: optional AddressSpaceRegion name (#216)
* chore: optional `AddressSpaceRegion` name * Update address_space.rs * Update mod.rs * Update address_space.rs
1 parent 8d965ab commit dea6e07

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

kernel/src/vm/address_space.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ impl AddressSpace {
9696
vmo: Arc<Vmo>,
9797
vmo_offset: usize,
9898
permissions: Permissions,
99-
name: String,
99+
name: Option<String>,
100100
) -> crate::Result<Pin<&mut AddressSpaceRegion>> {
101101
let base = self.find_spot(layout, VIRT_ALLOC_ENTROPY);
102102
let virt = Range::from(base..base.checked_add(layout.size()).unwrap());
@@ -122,7 +122,7 @@ impl AddressSpace {
122122
vmo: Arc<Vmo>,
123123
vmo_offset: usize,
124124
permissions: Permissions,
125-
name: String,
125+
name: Option<String>,
126126
) -> crate::Result<Pin<&mut AddressSpaceRegion>> {
127127
assert!(virt.start.is_aligned_to(PAGE_SIZE));
128128
assert!(virt.end.is_aligned_to(PAGE_SIZE));
@@ -149,10 +149,10 @@ impl AddressSpace {
149149
&mut self,
150150
range: Range<VirtualAddress>,
151151
permissions: Permissions,
152-
name: String,
152+
name: Option<String>,
153153
flush: &mut Flush,
154154
) -> crate::Result<()> {
155-
log::trace!("reserving {range:?} with flags {permissions:?} and name {name}");
155+
log::trace!("reserving {range:?} with flags {permissions:?} and name {name:?}");
156156

157157
let vmo = self
158158
.placeholder_vmo

kernel/src/vm/address_space_region.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub struct AddressSpaceRegion {
3838
/// The permissions of this region
3939
pub permissions: Permissions,
4040
/// The name of this region, for debugging
41-
pub name: String,
41+
pub name: Option<String>,
4242
/// The Virtual Memory Object backing this region
4343
pub vmo: Arc<Vmo>,
4444
pub vmo_offset: usize,
@@ -50,7 +50,7 @@ impl AddressSpaceRegion {
5050
permissions: Permissions,
5151
vmo: Arc<Vmo>,
5252
vmo_offset: usize,
53-
name: String,
53+
name: Option<String>,
5454
) -> Pin<Box<Self>> {
5555
Box::pin(Self {
5656
links: Default::default(),

kernel/src/vm/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub fn init(boot_info: &BootInfo, minfo: &MachineInfo) -> crate::Result<()> {
5656

5757
for region in aspace.regions.iter() {
5858
log::trace!(
59-
"{:<40} {}..{} {}",
59+
"{:<40?} {}..{} {}",
6060
region.name,
6161
region.range.start,
6262
region.range.end,
@@ -79,7 +79,7 @@ fn reserve_wired_regions(
7979
aspace.reserve(
8080
boot_info.physical_memory_map,
8181
Permissions::READ | Permissions::WRITE,
82-
"Physical Memory Map".to_string(),
82+
Some("Physical Memory Map".to_string()),
8383
flush,
8484
)?;
8585

@@ -133,7 +133,7 @@ fn reserve_wired_regions(
133133
.unwrap(),
134134
},
135135
permissions,
136-
format!("Kernel {permissions} Segment"),
136+
Some(format!("Kernel {permissions} Segment")),
137137
flush,
138138
)?;
139139
}

0 commit comments

Comments
 (0)