Rename to create_process_roots_work

mmtk · May 21, 2024 · b3850b8 · b3850b8
1 parent 88e1826
commit b3850b8
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
@@ -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/wks/mmtk-core.git", rev = "0e0ef693ab3b3727eb65ab7d4f4d6f30eef9ef5d" }
+mmtk = { git = "https://github.com/wks/mmtk-core.git", rev = "cf57f5e3d3b3cfa96b04cde42b3a68e5e8e69468" }
 # 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/src/scan_boot_image.rs b/mmtk/src/scan_boot_image.rs
@@ -56,14 +56,14 @@ pub fn scan_boot_image(
                 if slots.len() >= SLOTS_BUFFER_CAPACITY {
                     let new_slots =
                         mem::replace(&mut slots, Vec::with_capacity(SLOTS_BUFFER_CAPACITY));
-                    factory.create_process_root_slots_work(new_slots);
+                    factory.create_process_roots_work(new_slots);
                 }
             });
             trace!("Chunk processed successfully");
             cursor += stride;
         }
         if !slots.is_empty() {
-            factory.create_process_root_slots_work(slots);
+            factory.create_process_roots_work(slots);
         }
     }
 }

diff --git a/mmtk/src/scan_statics.rs b/mmtk/src/scan_statics.rs
@@ -51,14 +51,14 @@ pub fn scan_statics(
             // TODO: check_reference?
             slot_list.push(slots + slot_offset);
             if slot_list.len() >= SLOTS_BUFFER_CAPACITY {
-                factory.create_process_root_slots_work(slot_list);
+                factory.create_process_roots_work(slot_list);
                 slot_list = Vec::with_capacity(SLOTS_BUFFER_CAPACITY);
             }
             // trace.process_root_edge(slots + slot_offset, true);
             slot += REF_SLOT_SIZE;
         }
         if !slot_list.is_empty() {
-            factory.create_process_root_slots_work(slot_list);
+            factory.create_process_roots_work(slot_list);
         }
     }
 }

diff --git a/mmtk/src/scanning.rs b/mmtk/src/scanning.rs
@@ -46,7 +46,7 @@ extern "C" fn report_slots_and_renew_buffer<F: RootsWorkFactory<JikesRVMSlot>>(
     if !ptr.is_null() {
         let buf = unsafe { Vec::<Address>::from_raw_parts(ptr, length, SLOTS_BUFFER_CAPACITY) };
         let factory: &mut F = unsafe { &mut *factory };
-        factory.create_process_root_slots_work(buf);
+        factory.create_process_roots_work(buf);
     }
     let (ptr, _, capacity) = {
         // TODO: Use Vec::into_raw_parts() when the method is available.
@@ -365,11 +365,11 @@ impl<F: RootsWorkFactory<JikesRVMSlot>> GCWork<JikesRVM> for ScanGlobalRoots<F>
             slots.push(slot);
             if slots.len() >= SLOTS_BUFFER_CAPACITY {
                 let new_slots = mem::replace(&mut slots, Vec::with_capacity(SLOTS_BUFFER_CAPACITY));
-                self.factory.create_process_root_slots_work(new_slots);
+                self.factory.create_process_roots_work(new_slots);
             }
         });
         if !slots.is_empty() {
-            self.factory.create_process_root_slots_work(slots);
+            self.factory.create_process_roots_work(slots);
         }
     }
 }