Remove the coordinator thread

Author: wks

mmtk/Cargo.lock

@@ -27,7 +27,7 @@ log = "*"
 # - change branch
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI.
-mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "57af17fbfd94ff0df2cd3b1e504abe299ce4f0ab" }
+mmtk = { git = "https://github.com/wks/mmtk-core.git", rev="7cb0b2c12be341c084e03f2cd943fad8ac088f83" }
 # Uncomment the following and fix the path to mmtk-core to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 

mmtk/Cargo.toml

@@ -1,7 +1,7 @@
 use libc::c_char;
 use libc::c_void;
 use mmtk::memory_manager;
-use mmtk::scheduler::{GCController, GCWorker};
+use mmtk::scheduler::GCWorker;
 use mmtk::util::opaque_pointer::*;
 use mmtk::util::{Address, ObjectReference};
 use mmtk::AllocationSemantics;
@@ -97,18 +97,6 @@ pub extern "C" fn will_never_move(object: ObjectReference) -> bool {
     !object.is_movable()
 }
 
-#[no_mangle]
-// We trust the worker pointer is valid.
-#[allow(clippy::not_unsafe_ptr_arg_deref)]
-pub extern "C" fn start_control_collector(
-    mmtk: &'static mut MMTK<V8>,
-    tls: VMWorkerThread,
-    gc_controller: *mut GCController<V8>,
-) {
-    let mut gc_controller = unsafe { Box::from_raw(gc_controller) };
-    memory_manager::start_control_collector(&*mmtk, tls, &mut gc_controller);
-}
-
 #[no_mangle]
 // We trust the worker pointer is valid.
 #[allow(clippy::not_unsafe_ptr_arg_deref)]
@@ -117,8 +105,8 @@ pub extern "C" fn start_worker(
     tls: VMWorkerThread,
     worker: *mut GCWorker<V8>,
 ) {
-    let mut worker = unsafe { Box::from_raw(worker) };
-    memory_manager::start_worker::<V8>(mmtk, tls, &mut worker);
+    let worker = unsafe { Box::from_raw(worker) };
+    memory_manager::start_worker::<V8>(mmtk, tls, worker);
 }
 
 #[no_mangle]

mmtk/src/api.rs

@@ -5,7 +5,6 @@ use mmtk::Mutator;
 use UPCALLS;
 use V8;
 
-const GC_THREAD_KIND_CONTROLLER: libc::c_int = 0;
 const GC_THREAD_KIND_WORKER: libc::c_int = 1;
 
 pub struct VMCollection {}
@@ -34,10 +33,6 @@ impl Collection<V8> for VMCollection {
 
     fn spawn_gc_thread(tls: VMThread, ctx: GCThreadContext<V8>) {
         let (ctx_ptr, kind) = match ctx {
-            GCThreadContext::Controller(b) => (
-                Box::into_raw(b) as *mut libc::c_void,
-                GC_THREAD_KIND_CONTROLLER,
-            ),
             GCThreadContext::Worker(b) => {
                 (Box::into_raw(b) as *mut libc::c_void, GC_THREAD_KIND_WORKER)
             }

mmtk/src/collection.rs

@@ -52,7 +52,6 @@ extern bool process(void* builder, char* name, char* value);
 extern void scan_region(void *mmtk);
 extern void handle_user_collection_request(void *mmtk, void *tls);
 
-extern void start_control_collector(void *tls, void* controller);
 extern void start_worker(void *tls, void* worker);
 
 /**