Merge branch 'lock-block-list-in-release' into use-ms-as-nonmoving

Author: qinsoon

Cargo.toml

@@ -141,7 +141,7 @@ nogc_no_zeroing = ["nogc_lock_free"]
 single_worker = []
 
 # To run expensive comprehensive runtime checks, such as checking duplicate edges
-extreme_assertions = []
+extreme_assertions = ["ms_block_list_sanity"]
 
 # Enable multiple spaces for NoGC, each allocator maps to an individual ImmortalSpace.
 nogc_multi_space = []

src/policy/marksweepspace/native_ms/block_list.rs

@@ -36,33 +36,15 @@ impl BlockList {
         }
     }
 
-    // fn access_block_list<R: Copy, F: FnOnce() -> R>(&self, access_func: F) -> R {
-    //     #[cfg(feature = "ms_block_list_sanity")]
-    //     let mut sanity_list = self.sanity_list.lock().unwrap();
-
-    //     let ret = access_func();
-
-    //     // Verify the block list is the same as the sanity list
-    //     #[cfg(feature = "ms_block_list_sanity")]
-    //     {
-    //         if !sanity_list.iter().map(|b| *b).eq(BlockListIterator { cursor: self.first }) {
-    //             eprintln!("Sanity block list: {:?}", &mut sanity_list as &mut Vec<Block>);
-    //             eprintln!("Actual block list: {:?}", self);
-    //             panic!("Incorrect block list");
-    //         }
-    //     }
-
-    //     ret
-    // }
     #[cfg(feature = "ms_block_list_sanity")]
     fn verify_block_list(&self, sanity_list: &mut Vec<Block>) {
         if !sanity_list
             .iter()
-            .map(|b| *b)
+            .cloned()
             .eq(BlockListIterator { cursor: self.first })
         {
             eprintln!("Sanity block list: {:?}", sanity_list);
-            eprintln!("First {:?}", sanity_list.get(0));
+            eprintln!("First {:?}", sanity_list.first());
             eprintln!("Actual block list: {:?}", self);
             eprintln!("First {:?}", self.first);
             eprintln!("Block list {:?}", self as *const _);
@@ -71,6 +53,7 @@ impl BlockList {
     }
 
     /// List has no blocks
+    #[allow(clippy::let_and_return)]
     pub fn is_empty(&self) -> bool {
         let ret = self.first.is_none();
 
@@ -296,6 +279,7 @@ impl BlockList {
     }
 
     /// Get the size of this block list.
+    #[allow(clippy::let_and_return)]
     pub fn size(&self) -> usize {
         let ret = self.size;
 

src/policy/marksweepspace/native_ms/global.rs

@@ -65,11 +65,15 @@ impl AbandonedBlockLists {
     fn move_consumed_to_unswept(&mut self) {
         let mut i = 0;
         while i < MI_BIN_FULL {
+            // This is executed during release. We also execute SweepChunk which will access blocks and block lists during release.
+            // We have to acquire locks before we modify these block lists.
             self.consumed[i].lock();
             self.unswept[i].lock();
+
             if !self.consumed[i].is_empty() {
                 self.unswept[i].append(&mut self.consumed[i]);
             }
+
             self.unswept[i].unlock();
             self.consumed[i].unlock();
             i += 1;
@@ -78,6 +82,12 @@ impl AbandonedBlockLists {
 
     fn sweep<VM: VMBinding>(&mut self, space: &MarkSweepSpace<VM>) {
         for i in 0..MI_BIN_FULL {
+            // This is executed during release. We also execute SweepChunk which will access blocks and block lists during release.
+            // We have to acquire locks before we modify these block lists.
+            self.available[i].lock();
+            self.consumed[i].lock();
+            self.unswept[i].lock();
+
             self.available[i].sweep_blocks(space);
             self.consumed[i].sweep_blocks(space);
             self.unswept[i].sweep_blocks(space);
@@ -90,6 +100,10 @@ impl AbandonedBlockLists {
                     self.consumed[i].push(block);
                 }
             }
+
+            self.unswept[i].unlock();
+            self.consumed[i].unlock();
+            self.available[i].unlock();
         }
     }
 }