Adding assertion for live lines in immixspace; properly counting live bytes in los

Author: udesou

src/plan/global.rs

@@ -316,7 +316,7 @@ pub trait Plan: 'static + HasSpaces + Sync + Downcast {
         })
     }
 
-    // Dump memory stats for the plan
+    /// Dump memory stats for the plan
     #[cfg(feature = "dump_memory_stats")]
     fn dump_memory_stats(&self) {}
 }

src/policy/immix/immixspace.rs

@@ -481,12 +481,15 @@ impl<VM: VMBinding> ImmixSpace<VM> {
 
     #[cfg(feature = "dump_memory_stats")]
     pub(crate) fn dump_memory_stats(&self) {
+        use std::time::{SystemTime, UNIX_EPOCH};
+
         #[derive(Default)]
         struct Dist {
             live_blocks: usize,
             live_lines: usize,
         }
         let mut dist = Dist::default();
+
         for chunk in self.chunk_map.all_chunks() {
             if !self.address_in_space(chunk.start()) {
                 continue;
@@ -497,26 +500,43 @@ impl<VM: VMBinding> ImmixSpace<VM> {
                 .filter(|b| b.get_state() != BlockState::Unallocated)
             {
                 dist.live_blocks += 1;
+
+                let line_mark_state = self.line_mark_state.load(Ordering::Acquire);
+                let mut live_lines_in_table = 0;
+                let mut live_lines_from_block_state = 0;
+
+                for line in block.lines() {
+                    if line.is_marked(line_mark_state) {
+                        live_lines_in_table += 1;
+                    }
+                }
+
                 match block.get_state() {
                     BlockState::Marked => {
                         panic!("At this point the block should have been swept already");
                     }
                     BlockState::Unmarked => {
                         // Block is unmarked and cannot be reused (has no holes)
                         dist.live_lines += Block::LINES;
+                        live_lines_from_block_state += Block::LINES;
                     }
                     BlockState::Reusable { unavailable_lines } => {
                         dist.live_lines += unavailable_lines as usize;
+                        live_lines_from_block_state += unavailable_lines as usize;
                     }
                     BlockState::Unallocated => {}
                 }
+
+                assert_eq!(live_lines_in_table, live_lines_from_block_state);
             }
         }
 
-        println!(
-            "{} immixspace",
-            chrono::offset::Local::now().format("%Y-%m-%d %H:%M:%S")
-        );
+        let start = SystemTime::now();
+        let since_the_epoch = start
+            .duration_since(UNIX_EPOCH)
+            .expect("Time went backwards");
+
+        println!("{:?} immixspace", since_the_epoch.as_millis());
         println!("\tLive bytes = {}", self.get_live_bytes());
         println!("\tReserved pages = {}", self.reserved_pages());
         println!(

src/policy/largeobjectspace.rs

@@ -143,11 +143,6 @@ impl<VM: VMBinding> crate::policy::gc_work::PolicyTraceObject<VM> for LargeObjec
     fn may_move_objects<const KIND: crate::policy::gc_work::TraceKind>() -> bool {
         false
     }
-
-    #[cfg(feature = "dump_memory_stats")]
-    fn post_scan_object(&self, object: ObjectReference) {
-        self.increase_live_bytes(VM::VMObjectModel::get_current_size(object));
-    }
 }
 
 impl<VM: VMBinding> LargeObjectSpace<VM> {
@@ -298,6 +293,8 @@ impl<VM: VMBinding> LargeObjectSpace<VM> {
                 break;
             }
         }
+        #[cfg(feature = "dump_memory_stats")]
+        self.increase_live_bytes(VM::VMObjectModel::get_current_size(object));
         true
     }
 
@@ -337,10 +334,14 @@ impl<VM: VMBinding> LargeObjectSpace<VM> {
 
     #[cfg(feature = "dump_memory_stats")]
     pub(crate) fn dump_memory_stats(&self) {
-        println!(
-            "{} los",
-            chrono::offset::Local::now().format("%Y-%m-%d %H:%M:%S")
-        );
+        use std::time::{SystemTime, UNIX_EPOCH};
+
+        let start = SystemTime::now();
+        let since_the_epoch = start
+            .duration_since(UNIX_EPOCH)
+            .expect("Time went backwards");
+
+        println!("{} los", since_the_epoch.as_millis());
         println!("\tLive bytes = {}", self.get_live_bytes());
         println!("\tReserved pages = {}", self.reserved_pages());
         println!(