Merge branch 'master' into feature/fork

Author: wks

mmtk/Cargo.lock

@@ -36,8 +36,8 @@ probe = "0.5"
 features = ["is_mmtk_object", "object_pinning"]
 
 # Uncomment the following lines to use mmtk-core from the official repository.
-#git = "https://github.com/wks/mmtk-core.git"
-#rev = "7cb0b2c12be341c084e03f2cd943fad8ac088f83"
+#git = "https://github.com/mmtk/mmtk-core.git"
+#rev = "42754a5f23fdb513039d7f07e52014ded42c98bf"
 
 # Uncomment the following line to use mmtk-core from a local repository.
 path = "../../mmtk-core"

mmtk/Cargo.toml

@@ -101,7 +101,7 @@ impl RubyObjectAccess {
 
     pub fn suffix_size() -> usize {
         // In RACTOR_CHECK_MODE, Ruby hides a field after each object to hold the Ractor ID.
-        unsafe { crate::BINDING_FAST.suffix_size }
+        unsafe { crate::BINDING_FAST_MUT.suffix_size }
     }
 
     pub fn object_size(&self) -> usize {

mmtk/src/abi.rs

@@ -2,6 +2,7 @@
 #![allow(clippy::not_unsafe_ptr_arg_deref)]
 
 use std::ffi::CStr;
+use std::sync::atomic::Ordering;
 
 use crate::abi;
 use crate::abi::RawVecOfObjRef;
@@ -11,6 +12,7 @@ use crate::binding;
 use crate::binding::RubyBinding;
 use crate::mmtk;
 use crate::Ruby;
+use crate::BINDING_FAST;
 use mmtk::memory_manager;
 use mmtk::memory_manager::mmtk_init;
 use mmtk::util::alloc::AllocatorInfo;
@@ -167,12 +169,12 @@ pub extern "C" fn mmtk_after_fork(tls: VMThread) {
 
 #[no_mangle]
 pub extern "C" fn mmtk_enable_collection() {
-    memory_manager::enable_collection(mmtk())
+    BINDING_FAST.gc_enabled.store(true, Ordering::Relaxed);
 }
 
 #[no_mangle]
 pub extern "C" fn mmtk_disable_collection() {
-    memory_manager::disable_collection(mmtk())
+    BINDING_FAST.gc_enabled.store(false, Ordering::Relaxed);
 }
 
 #[no_mangle]

mmtk/src/api.rs

@@ -1,5 +1,6 @@
 use std::collections::HashMap;
 use std::ffi::CString;
+use std::sync::atomic::AtomicBool;
 use std::sync::Mutex;
 use std::thread::JoinHandle;
 
@@ -13,12 +14,25 @@ use crate::ppp::PPPRegistry;
 use crate::weak_proc::WeakProcessor;
 use crate::Ruby;
 
-#[derive(Default)]
 pub struct RubyBindingFast {
-    pub suffix_size: usize,
+    pub gc_enabled: AtomicBool,
 }
 
 impl RubyBindingFast {
+    pub const fn new() -> Self {
+        Self {
+            // Mimic the old behavior when the gc_enabled flag was in mmtk-core.
+            // We may refactor it so that it is false by default.
+            gc_enabled: AtomicBool::new(true),
+        }
+    }
+}
+
+pub struct RubyBindingFastMut {
+    pub suffix_size: usize,
+}
+
+impl RubyBindingFastMut {
     pub const fn new() -> Self {
         Self { suffix_size: 0 }
     }
@@ -50,7 +64,7 @@ impl RubyBinding {
         upcalls: *const abi::RubyUpcalls,
     ) -> Self {
         unsafe {
-            crate::BINDING_FAST.suffix_size = binding_options.suffix_size;
+            crate::BINDING_FAST_MUT.suffix_size = binding_options.suffix_size;
         }
         Self {
             mmtk,

mmtk/src/binding.rs

@@ -6,11 +6,16 @@ use mmtk::memory_manager;
 use mmtk::scheduler::*;
 use mmtk::util::{VMMutatorThread, VMThread, VMWorkerThread};
 use mmtk::vm::{Collection, GCThreadContext};
+use std::sync::atomic::Ordering;
 use std::thread;
 
 pub struct VMCollection {}
 
 impl Collection<Ruby> for VMCollection {
+    fn is_collection_enabled() -> bool {
+        crate::BINDING_FAST.gc_enabled.load(Ordering::Relaxed)
+    }
+
     fn stop_all_mutators<F>(tls: VMWorkerThread, mut mutator_visitor: F)
     where
         F: FnMut(&'static mut mmtk::Mutator<Ruby>),

mmtk/src/collection.rs

@@ -11,7 +11,7 @@ use std::sync::Mutex;
 use std::thread::ThreadId;
 
 use abi::RubyUpcalls;
-use binding::{RubyBinding, RubyBindingFast};
+use binding::{RubyBinding, RubyBindingFast, RubyBindingFastMut};
 use mmtk::vm::edge_shape::{SimpleEdge, UnimplementedMemorySlice};
 use mmtk::vm::VMBinding;
 use mmtk::MMTK;
@@ -55,9 +55,12 @@ impl VMBinding for Ruby {
 /// The singleton object for the Ruby binding itself.
 pub static BINDING: OnceCell<RubyBinding> = OnceCell::new();
 
+/// Some data needs to be accessed fast.
+pub static BINDING_FAST: RubyBindingFast = RubyBindingFast::new();
+
 /// Some data needs to be accessed fast.
 /// We sacrifice safety for speed using unsynchronized global variables.
-pub static mut BINDING_FAST: RubyBindingFast = RubyBindingFast::new();
+pub static mut BINDING_FAST_MUT: RubyBindingFastMut = RubyBindingFastMut::new();
 
 pub fn binding<'b>() -> &'b RubyBinding {
     BINDING