saymrwulf/xous-core
1
0
Fork 0
mirror of https://github.com/saymrwulf/xous-core.git synced 2026-11-15 08:30:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up the page table enumeration

Browse source 
since all the keys are now disclosed, the routine has been
renamed accordingly and the re-scan of existing bases is
redundant.
This commit is contained in:
bunnie 2022-07-03 01:12:12 +08:00
parent 559229d85e
commit 8a81954cf0
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
services/pddb/src/backend/hw.rs
View file

@ -1756,25 +1756,16 @@ impl PddbOs {
/// can decline to unlock all the Basis right now, cancelling out of the process, which will
/// cause the requesting free space sweep to fail.
pub(crate) fn pddb_generate_used_map(&self, cache: &Vec::<BasisCacheEntry>) -> Option<BinaryHeap<Reverse<u32>>> {
if let Some(extra_keys) = self.pddb_get_additional_keys(&cache) {
if let Some(all_keys) = self.pddb_get_all_keys(&cache) {
let mut page_heap = BinaryHeap::new();
// 1. check the extra keys, if any
for (key, name) in extra_keys {
// scan the extra closed basis
for (key, name) in all_keys {
// scan the disclosed bases
if let Some(map) = self.pt_scan_key(&key, &name) {
for pp in map.values() {
page_heap.push(Reverse(pp.page_number()))
}
}
}
// 2. scan through all of the physical pages in our caches, and add them to a binary heap.
// WARNING: this could get really big for a very large filesystem. It's capped at ~100k for
// Precursor's ~100MiB storage increment.
for entry in cache {
for pp in entry.v2p_map.values() {
page_heap.push(Reverse(pp.page_number()));
}
}
Some(page_heap)
} else {
None
@ -1787,7 +1778,7 @@ impl PddbOs {
/// valid (it'll scan up and stop as soon as one Pte checks out). Note that it then only returns
/// a Vec of keys & names, not a BasisCacheEntry -- so it means that the Basis still are "closed"
/// at the conclusion of the sweep, but their page use can be accounted for.
pub(crate) fn pddb_get_additional_keys(&self, cache: &Vec::<BasisCacheEntry>) -> Option<Vec<([u8; AES_KEYSIZE], String)>> {
pub(crate) fn pddb_get_all_keys(&self, cache: &Vec::<BasisCacheEntry>) -> Option<Vec<([u8; AES_KEYSIZE], String)>> {
const SWAP_DELAY_MS: usize = 300;
let mut ret = Vec::<([u8; AES_KEYSIZE], String)>::new();
for entry in cache {