Test framework for FifoSwapManager. Not passed.

crate/memory/src/swap/fifo.rs

@@ -1,13 +1,15 @@
 use alloc::vec_deque::VecDeque;
 use super::*;
 
-struct FifoSwapManager {
+struct FifoSwapManager<T: 'static + PageTable> {
+    page_table: &'static T,
     deque: VecDeque<Addr>,
 }
 
-impl<T: PageTable> SwapManager<T> for FifoSwapManager {
+impl<T: 'static + PageTable> SwapManager<T> for FifoSwapManager<T> {
-    fn new(_page_table: &T) -> Self {
+    fn new(page_table: &'static T) -> Self {
         FifoSwapManager {
+            page_table,
             deque: VecDeque::<Addr>::new()
         }
     }
@@ -35,16 +37,56 @@ impl<T: PageTable> SwapManager<T> for FifoSwapManager {
 #[cfg(test)]
 mod test {
     use super::*;
+    use super::mock_page_table::MockPageTable;
+
+    enum MemOp {
+        R(usize), W(usize)
+    }
+
+    fn assert_pgfault_eq(x: usize) {
+        assert_eq!(unsafe{ PGFAULT_COUNT }, x);
+    }
+
+    // For pgfault_handler:
+    static mut PGFAULT_COUNT: usize = 0;
+    static mut PAGE: *mut MockPageTable = 0 as *mut _;
+    static mut FIFO: *mut FifoSwapManager<MockPageTable> = 0 as *mut _;
+
+    fn pgfault_handler(pt: &mut MockPageTable, addr: Addr) {
+        unsafe{ PGFAULT_COUNT += 1; }
+        let fifo = unsafe{ &mut *FIFO };
+        if let Some(x) = fifo.swap() {
+            pt.unmap(x);
+        }
+        pt.map(addr);
+    }
 
     #[test]
     fn test() {
-//        let mut pt = mock_page_table::MockPageTable::new();
+        use self::MemOp::{R, W};
-//        let mut sm = FifoSwapManager::new();
+        let mut pt = MockPageTable::new(pgfault_handler);
-//        let write_seq = [3, 1, 4, 2, 5, 2, 1, 2, 3, 4, 5, 1, 1];
+        let mut fifo = FifoSwapManager::<MockPageTable>::new(
-//        let pgfault_count = [4, 4, 4, 4, 5, 5, 6, 7, 8, 9, 10, 11, 11];
+            unsafe{ &*(&pt as *const _) });
-//        for i in write_seq {
+        unsafe {
-//            pt.write(i);
+            PAGE = &mut pt as *mut _;
-//        }
+            FIFO = &mut fifo as *mut _;
-
+        }
+        let op_seq = [
+            R(1), R(2), R(3), R(4),
+            W(3), W(1), W(4), W(2), W(5),
+            W(2), W(1), W(2), W(3), W(4),
+            W(5), R(1), W(1)];
+        let pgfault_count = [
+            1, 2, 3, 4,
+            4, 4, 4, 4, 5,
+            5, 6, 7, 8, 9,
+            10, 11, 11];
+        for (op, &count) in op_seq.iter().zip(pgfault_count.iter()) {
+            match op {
+                R(addr) => pt.read(*addr),
+                W(addr) => pt.write(*addr),
+            }
+            assert_pgfault_eq(count);
+        }
     }
 }

crate/memory/src/swap/mod.rs

@@ -5,7 +5,7 @@ type Addr = usize;
 
 trait SwapManager<T: PageTable> {
     /// Create and initialize for the swap manager
-    fn new(page_table: &T) -> Self;
+    fn new(page_table: &'static T) -> Self;
     /// Called when tick interrupt occured
     fn tick(&mut self);
     /// Called when map a swappable page into the memory