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

fix swapalloc ordering

Browse source 
we want a max-heap, because pops are cheaper on the sorted vec.
This commit is contained in:
bunnie 2024-05-13 19:19:15 +08:00
parent 0fca04f14e
commit b138f63f93
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
loader/src/swap.rs
View file

@ -141,6 +141,10 @@ impl SwapAlloc {
pub fn is_wired(&self) -> bool { self.vpn & SWAP_FLG_WIRED != 0 }
pub fn is_valid(&self) -> bool { self.timestamp != 0 || self.vpn != 0 }
pub fn raw_pid(&self) -> u8 { self.vpn as u8 }
pub fn vaddr(&self) -> usize { (self.vpn & !0xFFFu32) as usize }
}
impl fmt::Debug for SwapAlloc {
@ -164,9 +168,9 @@ impl PartialOrd for SwapAlloc {
}
impl Ord for SwapAlloc {
// Note: the ordering will give us a min-heap (reversed from the "usual sense")
fn cmp(&self, other: &Self) -> core::cmp::Ordering { other.timestamp.cmp(&self.timestamp) }
// Select this for min-heap (smallest timestamps at lower indices)
// fn cmp(&self, other: &Self) -> core::cmp::Ordering { other.timestamp.cmp(&self.timestamp) }
// Note: the ordering will give us a max-heap (keep comment around for debugging)
// fn cmp(&self, other: &Self) -> core::cmp::Ordering { self.timestamp.cmp(&other.timestamp) }
// Select this for max-heap (biggest timestamps at lower indices)
fn cmp(&self, other: &Self) -> core::cmp::Ordering { self.timestamp.cmp(&other.timestamp) }
}