Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-23 01:13:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename PageTableQueryResult to PageTableItem

Browse Source
This commit is contained in:
Zhang Junyang
2024-08-12 06:42:04 +00:00
committed by Tate, Hongliang Tian
parent 6df0a3073c
commit e597a10088
5 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ostd/src/mm/page_table/cursor.rs
View File

@ -76,7 +76,7 @@ use super::{
use crate::mm::{page::DynPage, Paddr, PageProperty, Vaddr};
#[derive(Clone, Debug)]
pub enum PageTableQueryResult {
pub enum PageTableItem {
NotMapped {
va: Vaddr,
len: usize,
@ -195,7 +195,7 @@ where
}
/// Gets the information of the current slot.
pub fn query(&mut self) -> Result<PageTableQueryResult, PageTableError> {
pub fn query(&mut self) -> Result<PageTableItem, PageTableError> {
if self.va >= self.barrier_va.end {
return Err(PageTableError::InvalidVaddr(self.va));
}
@ -206,7 +206,7 @@ where
let pte = self.read_cur_pte();
if !pte.is_present() {
return Ok(PageTableQueryResult::NotMapped {
return Ok(PageTableItem::NotMapped {
va,
len: page_size::<C>(level),
});
@ -218,14 +218,14 @@ where
match self.cur_child() {
Child::Page(page) => {
return Ok(PageTableQueryResult::Mapped {
return Ok(PageTableItem::Mapped {
va,
page,
prop: pte.prop(),
});
}
Child::Untracked(pa) => {
return Ok(PageTableQueryResult::MappedUntracked {
return Ok(PageTableItem::MappedUntracked {
va,
pa,
len: page_size::<C>(level),
@ -355,7 +355,7 @@ impl<'a, M: PageTableMode, E: PageTableEntryTrait, C: PagingConstsTrait> Iterato
where
[(); C::NR_LEVELS as usize]:,
{
type Item = PageTableQueryResult;
type Item = PageTableItem;
fn next(&mut self) -> Option<Self::Item> {
let result = self.query();
@ -415,7 +415,7 @@ where
}
/// Gets the information of the current slot.
pub fn query(&mut self) -> Result<PageTableQueryResult, PageTableError> {
pub fn query(&mut self) -> Result<PageTableItem, PageTableError> {
self.0.query()
}