mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
unit tests for the free key index tracker
This commit is contained in:
parent
8de0d70f43
commit
9d83b37818
2 changed files with 123 additions and 14 deletions
|
|
@ -753,18 +753,24 @@ impl DictCacheEntry {
|
||||||
FreeKeyCases::RightAdjacent => {
|
FreeKeyCases::RightAdjacent => {
|
||||||
// see if we should merge to the right
|
// see if we should merge to the right
|
||||||
if i + 1 < free_key_vec.len() {
|
if i + 1 < free_key_vec.len() {
|
||||||
if free_key_vec[i+1].arg_compared_to_self(i as u32) == FreeKeyCases::LeftAdjacent {
|
println!("middle insert {}: {:?}, {:?}", index, free_key_vec[i], free_key_vec[i+1]);
|
||||||
self.free_keys.push(FreeKeyRange{
|
if free_key_vec[i+1].arg_compared_to_self(index as u32) == FreeKeyCases::LeftAdjacent {
|
||||||
start: free_key_vec[i].start,
|
self.free_keys.push(
|
||||||
run: free_key_vec[i].run + free_key_vec[i+1].run + 2
|
FreeKeyRange{
|
||||||
});
|
start: free_key_vec[i].start,
|
||||||
|
run: free_key_vec[i].run + free_key_vec[i+1].run + 2
|
||||||
|
});
|
||||||
skip = true;
|
skip = true;
|
||||||
placed = true;
|
placed = true;
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
self.free_keys.push(FreeKeyRange { start: free_key_vec[i].start, run: free_key_vec[i].run + 1 });
|
|
||||||
placed = true;
|
|
||||||
}
|
}
|
||||||
|
self.free_keys.push(
|
||||||
|
FreeKeyRange {
|
||||||
|
start: free_key_vec[i].start,
|
||||||
|
run: free_key_vec[i].run + 1
|
||||||
|
});
|
||||||
|
placed = true;
|
||||||
}
|
}
|
||||||
FreeKeyCases::GreaterThan => {
|
FreeKeyCases::GreaterThan => {
|
||||||
self.free_keys.push(free_key_vec[i]);
|
self.free_keys.push(free_key_vec[i]);
|
||||||
|
|
@ -858,7 +864,7 @@ impl<'a> Default for DictKeyVpage {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#[derive(PartialEq, Eq)]
|
#[derive(PartialEq, Eq, Debug)]
|
||||||
pub(crate) enum FreeKeyCases {
|
pub(crate) enum FreeKeyCases {
|
||||||
LeftAdjacent,
|
LeftAdjacent,
|
||||||
RightAdjacent,
|
RightAdjacent,
|
||||||
|
|
@ -866,7 +872,7 @@ pub(crate) enum FreeKeyCases {
|
||||||
LessThan,
|
LessThan,
|
||||||
GreaterThan,
|
GreaterThan,
|
||||||
}
|
}
|
||||||
#[derive(Eq, Copy, Clone)]
|
#[derive(Eq, Copy, Clone, Debug)]
|
||||||
pub(crate) struct FreeKeyRange {
|
pub(crate) struct FreeKeyRange {
|
||||||
/// This index should be free
|
/// This index should be free
|
||||||
pub(crate) start: u32,
|
pub(crate) start: u32,
|
||||||
|
|
@ -894,12 +900,12 @@ impl FreeKeyRange {
|
||||||
impl Ord for FreeKeyRange {
|
impl Ord for FreeKeyRange {
|
||||||
fn cmp(&self, other: &Self) -> Ordering {
|
fn cmp(&self, other: &Self) -> Ordering {
|
||||||
// note the reverse order -- so we can sort as a "min-heap"
|
// note the reverse order -- so we can sort as a "min-heap"
|
||||||
other.start.cmp(&self.start)
|
self.start.cmp(&other.start)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl PartialOrd for FreeKeyRange {
|
impl PartialOrd for FreeKeyRange {
|
||||||
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
|
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
|
||||||
Some(self.cmp(other))
|
Some(self.cmp(&other))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
impl PartialEq for FreeKeyRange {
|
impl PartialEq for FreeKeyRange {
|
||||||
|
|
@ -945,4 +951,107 @@ impl PlaintextCache {
|
||||||
self.tag = None;
|
self.tag = None;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn clone_bheap<T: Clone + Ord + Copy>(heap: &mut BinaryHeap<T>) -> BinaryHeap<T> {
|
||||||
|
let heap_copy = std::mem::replace(heap, BinaryHeap::<T>::new());
|
||||||
|
let mut heap_clone = BinaryHeap::<T>::new();
|
||||||
|
let heap_vec = heap_copy.into_sorted_vec();
|
||||||
|
for &i in heap_vec.iter() {
|
||||||
|
heap_clone.push(i.clone());
|
||||||
|
heap.push(i);
|
||||||
|
}
|
||||||
|
heap_clone
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn test_free_key_index() {
|
||||||
|
let mut d = DictCacheEntry::new(
|
||||||
|
Dictionary::default(),
|
||||||
|
1,
|
||||||
|
&Vec::<u8>::new(),
|
||||||
|
);
|
||||||
|
let init_max = KEY_MAXCOUNT as u32 - 1 - 1;
|
||||||
|
// 1..131070
|
||||||
|
let c = clone_bheap(&mut d.free_keys);
|
||||||
|
let f = c.into_sorted_vec();
|
||||||
|
assert!(f.len() == 1);
|
||||||
|
assert!(f[0].start == 1);
|
||||||
|
assert!(f[0].run == init_max);
|
||||||
|
for i in 0..10 {
|
||||||
|
assert!(d.get_free_key_index().unwrap().get() == i+1);
|
||||||
|
}
|
||||||
|
// 11...131060
|
||||||
|
let c = clone_bheap(&mut d.free_keys);
|
||||||
|
let f = c.into_sorted_vec();
|
||||||
|
assert!(f.len() == 1);
|
||||||
|
assert!(f[0].start == 11);
|
||||||
|
assert!(f[0].run == init_max - 10);
|
||||||
|
|
||||||
|
d.put_free_key_index(4);
|
||||||
|
let c = clone_bheap(&mut d.free_keys);
|
||||||
|
let f = c.into_sorted_vec();
|
||||||
|
println!("insert 4: {:?}", f);
|
||||||
|
assert!(f.len() == 2);
|
||||||
|
assert!(f[0].start == 4);
|
||||||
|
assert!(f[0].run == 0);
|
||||||
|
assert!(f[1].start == 11);
|
||||||
|
assert!(f[1].run == init_max - 10);
|
||||||
|
|
||||||
|
d.put_free_key_index(9);
|
||||||
|
let c = clone_bheap(&mut d.free_keys);
|
||||||
|
let f = c.into_sorted_vec();
|
||||||
|
println!("insert 9: {:?}", f);
|
||||||
|
assert!(f.len() == 3);
|
||||||
|
assert!(f[0].start == 4);
|
||||||
|
assert!(f[0].run == 0);
|
||||||
|
assert!(f[1].start == 9);
|
||||||
|
assert!(f[1].run == 0);
|
||||||
|
assert!(f[2].start == 11);
|
||||||
|
assert!(f[2].run == init_max - 10);
|
||||||
|
|
||||||
|
d.put_free_key_index(10);
|
||||||
|
let c = clone_bheap(&mut d.free_keys);
|
||||||
|
let f = c.into_sorted_vec();
|
||||||
|
println!("insert 10: {:?}", f);
|
||||||
|
assert!(f.len() == 2);
|
||||||
|
assert!(f[0].start == 4);
|
||||||
|
assert!(f[0].run == 0);
|
||||||
|
assert!(f[1].start == 9);
|
||||||
|
assert!(f[1].run == init_max - 8);
|
||||||
|
|
||||||
|
d.put_free_key_index(3);
|
||||||
|
let c = clone_bheap(&mut d.free_keys);
|
||||||
|
let f = c.into_sorted_vec();
|
||||||
|
println!("insert 3: {:?}", f);
|
||||||
|
assert!(f.len() == 2);
|
||||||
|
assert!(f[0].start == 3);
|
||||||
|
assert!(f[0].run == 1);
|
||||||
|
assert!(f[1].start == 9);
|
||||||
|
assert!(f[1].run == init_max - 8);
|
||||||
|
|
||||||
|
d.put_free_key_index(5);
|
||||||
|
let c = clone_bheap(&mut d.free_keys);
|
||||||
|
let f = c.into_sorted_vec();
|
||||||
|
println!("insert 5: {:?}", f);
|
||||||
|
assert!(f.len() == 2);
|
||||||
|
assert!(f[0].start == 3);
|
||||||
|
assert!(f[0].run == 2);
|
||||||
|
assert!(f[1].start == 9);
|
||||||
|
assert!(f[1].run == init_max - 8);
|
||||||
|
|
||||||
|
d.put_free_key_index(8);
|
||||||
|
let c = clone_bheap(&mut d.free_keys);
|
||||||
|
let f = c.into_sorted_vec();
|
||||||
|
println!("insert 8: {:?}", f);
|
||||||
|
assert!(f.len() == 2);
|
||||||
|
assert!(f[0].start == 3);
|
||||||
|
assert!(f[0].run == 2);
|
||||||
|
assert!(f[1].start == 8);
|
||||||
|
assert!(f[1].run == init_max - 7);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,6 @@ pub(crate) fn patch_test(hw: &mut PddbOs, basis_cache: &mut BasisCache,
|
||||||
for dict in dict_list.iter() {
|
for dict in dict_list.iter() {
|
||||||
if let Ok(key_list) = basis_cache.key_list(hw, dict) {
|
if let Ok(key_list) = basis_cache.key_list(hw, dict) {
|
||||||
for key in key_list.iter() {
|
for key in key_list.iter() {
|
||||||
let mut patchbuf = [0u8; UPPER_BOUND];
|
|
||||||
// this actually does something a bit more complicated on a multi-basis system than you'd think:
|
// this actually does something a bit more complicated on a multi-basis system than you'd think:
|
||||||
// it will get the union of all key names, and then patch the *latest open basis* only with new data.
|
// it will get the union of all key names, and then patch the *latest open basis* only with new data.
|
||||||
// note: if the key didn't already exist in the latest open basis, it's added, with just that patch data in it.
|
// note: if the key didn't already exist in the latest open basis, it's added, with just that patch data in it.
|
||||||
|
|
@ -125,6 +124,7 @@ pub(crate) fn patch_test(hw: &mut PddbOs, basis_cache: &mut BasisCache,
|
||||||
|
|
||||||
// now fix the CI checksum. structured as two separate patches. not because it's efficient,
|
// now fix the CI checksum. structured as two separate patches. not because it's efficient,
|
||||||
// but because it exercises the code harder.
|
// but because it exercises the code harder.
|
||||||
|
let mut patchbuf = [0u8; UPPER_BOUND];
|
||||||
let readlen = basis_cache.key_read(hw, dict, key, &mut patchbuf, Some(0), None).unwrap();
|
let readlen = basis_cache.key_read(hw, dict, key, &mut patchbuf, Some(0), None).unwrap();
|
||||||
if !extend {
|
if !extend {
|
||||||
// now re-compute the checksum
|
// now re-compute the checksum
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue