Remove coordinator thread (#159)

Upstream PR: mmtk/mmtk-core#1067 --------- Co-authored-by: mmtkgc-bot <[email protected]>
mmtk · Apr 9, 2024 · 410d17f · 410d17f
1 parent 5766c8f
commit 410d17f
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 44 deletions.
diff --git a/jikesrvm/rvm/src/org/jikesrvm/mm/mminterface/CollectorThread.java b/jikesrvm/rvm/src/org/jikesrvm/mm/mminterface/CollectorThread.java
@@ -40,12 +40,10 @@ public final class CollectorThread extends SystemThread {
 
   @Entrypoint
   private Address workerInstance = Address.zero();
-  private boolean isController;
 
-  public void setWorker(Address worker, boolean isController) {
+  public void setWorker(Address worker) {
     rvmThread.assertIsRustMMTkCollector();
     this.workerInstance = worker;
-    this.isController = isController;
   }
 
   /** used by collector threads to hold state during stack scanning */
@@ -99,11 +97,7 @@ public CollectorThread(byte[] stack, CollectorContext context) {
   @Unpreemptible
   public void run() {
     if (VM.BuildWithRustMMTk) {
-      if (this.isController) {
-        sysCall.sysStartControlCollector(Magic.objectAsAddress(rvmThread), workerInstance);
-      } else {
-        sysCall.sysStartWorker(Magic.objectAsAddress(rvmThread), workerInstance);
-      }
+      sysCall.sysStartWorker(Magic.objectAsAddress(rvmThread), workerInstance);
     } else {
       rvmThread.collectorContext.run();
     }

diff --git a/jikesrvm/rvm/src/org/jikesrvm/runtime/Entrypoints.java b/jikesrvm/rvm/src/org/jikesrvm/runtime/Entrypoints.java
@@ -168,7 +168,7 @@ public class Entrypoints {
                   "(Lorg/vmmagic/unboxed/ObjectReference;)V");
   public static final NormalMethod spawnCollectorThreadMethod =
           getMethod(org.jikesrvm.mm.mminterface.MemoryManager.class, "spawnCollectorThread",
-                  "(Lorg/vmmagic/unboxed/Address;Z)V");
+                  "(Lorg/vmmagic/unboxed/Address;)V");
   public static final NormalMethod outOfMemoryMethod =
           getMethod(org.jikesrvm.mm.mminterface.MemoryManager.class, "outOfMemory",
                   "()V");

diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -16,7 +16,7 @@ lto = true
 [package.metadata.jikesrvm]
 # Our CI matches the following line and extract mmtk/jikesrvm. If this line is updated, please check ci yaml files and make sure it works.
 jikesrvm_repo = "https://github.com/mmtk/jikesrvm.git"
-jikesrvm_version = "259ffacf23d414686bae3ecf843e65d25dfc376e"
+jikesrvm_version = "a43efe4f33a6a69aabeb03e5c5e2e8880f96f047"
 
 [dependencies]
 libc = "0.2"
@@ -28,7 +28,7 @@ log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"]
 # - change branch/rev
 # - 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 = "86518d2ebc34b443c312de017dc81c7b097e3b10" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "5ab62f96c006475285b00b6d20a8b1bf83b74a4d" }
 # Uncomment the following to build locally - if you change the path locally, do not commit the change in a PR
 # mmtk = { path = "../repos/mmtk-core" }
 

diff --git a/mmtk/api/mmtk.h b/mmtk/api/mmtk.h
@@ -44,7 +44,6 @@ extern bool process(char* name, char* value);
 extern void scan_region();
 extern void handle_user_collection_request(void *tls);
 
-extern void start_control_collector(void *tls, void* controller);
 extern void start_worker(void *tls, void* worker);
 
 extern void release_buffer(void* buffer);
@@ -113,4 +112,4 @@ extern void harness_end();
 }
 #endif
 
-#endif // MMTK_H
+#endif // MMTK_H
diff --git a/mmtk/src/api.rs b/mmtk/src/api.rs
@@ -119,32 +119,16 @@ pub extern "C" fn will_never_move(object: ObjectReference) -> i32 {
     !object.is_movable() as i32
 }
 
-#[no_mangle]
-// We trust the gc_collector pointer is valid.
-#[allow(clippy::not_unsafe_ptr_arg_deref)]
-pub extern "C" fn start_control_collector(
-    tls: VMWorkerThread,
-    gc_controller: *mut GCController<JikesRVM>,
-) {
-    let mut gc_controller = unsafe { Box::from_raw(gc_controller) };
-    let cstr = std::ffi::CString::new("MMTkController").unwrap();
-    unsafe {
-        libc::pthread_setname_np(libc::pthread_self(), cstr.as_ptr());
-    }
-
-    memory_manager::start_control_collector(&SINGLETON, tls, &mut gc_controller);
-}
-
 #[no_mangle]
 // We trust the worker pointer is valid.
 #[allow(clippy::not_unsafe_ptr_arg_deref)]
 pub extern "C" fn start_worker(tls: VMWorkerThread, worker: *mut GCWorker<JikesRVM>) {
-    let mut worker = unsafe { Box::from_raw(worker) };
+    let worker = unsafe { Box::from_raw(worker) };
     let cstr = std::ffi::CString::new(format!("MMTkWorker{}", worker.ordinal)).unwrap();
     unsafe {
         libc::pthread_setname_np(libc::pthread_self(), cstr.as_ptr());
     }
-    memory_manager::start_worker::<JikesRVM>(&SINGLETON, tls, &mut worker)
+    memory_manager::start_worker::<JikesRVM>(&SINGLETON, tls, worker)
 }
 
 #[no_mangle]

diff --git a/mmtk/src/collection.rs b/mmtk/src/collection.rs
@@ -56,17 +56,11 @@ impl Collection<JikesRVM> for VMCollection {
     }
 
     fn spawn_gc_thread(tls: VMThread, ctx: GCThreadContext<JikesRVM>) {
-        let (ctx_ptr, is_controller) = match ctx {
-            GCThreadContext::Controller(c) => (Box::into_raw(c) as *mut libc::c_void, 1),
-            GCThreadContext::Worker(c) => (Box::into_raw(c) as *mut libc::c_void, 0),
+        let ctx_ptr = match ctx {
+            GCThreadContext::Worker(c) => Box::into_raw(c),
         };
         unsafe {
-            jtoc_call!(
-                SPAWN_COLLECTOR_THREAD_METHOD_OFFSET,
-                tls,
-                ctx_ptr,
-                is_controller
-            );
+            jtoc_call!(SPAWN_COLLECTOR_THREAD_METHOD_OFFSET, tls, ctx_ptr);
         }
     }