mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-27 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ruby/mmtk] Split ProcessObjFreeCandidates to parallel and non-parallel

Browse Source 
This makes it easier to visualize in profilers which one is non-parallel.

https://github.com/ruby/mmtk/commit/ba68b2ef3b
This commit is contained in:
Peter Zhu 2025-12-30 14:03:40 -05:00 committed by git
parent 544770d566
commit dbfedeb3a3
1 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
gc/mmtk/src/weak_proc.rs
View File

@ -97,17 +97,13 @@ impl WeakProcessor {
) {
worker.add_work(
WorkBucketStage::VMRefClosure,
ProcessObjFreeCandidates {
process_type: ProcessObjFreeCandidatesType::NonParallel,
},
ProcessNonParallelObjFreeCanadidates {},
);
for i in 0..self.parallel_obj_free_candidates.len() {
for index in 0..self.parallel_obj_free_candidates.len() {
worker.add_work(
WorkBucketStage::VMRefClosure,
ProcessObjFreeCandidates {
process_type: ProcessObjFreeCandidatesType::Parallel(i),
},
ProcessParallelObjFreeCandidates { index },
);
}
@ -127,49 +123,50 @@ impl WeakProcessor {
}
}
enum ProcessObjFreeCandidatesType {
NonParallel,
Parallel(usize),
}
fn process_obj_free_candidates(obj_free_candidates: &mut Vec<ObjectReference>) {
// Process obj_free
let mut new_candidates = Vec::new();
struct ProcessObjFreeCandidates {
process_type: ProcessObjFreeCandidatesType,
}
impl GCWork<Ruby> for ProcessObjFreeCandidates {
fn do_work(&mut self, _worker: &mut GCWorker<Ruby>, _mmtk: &'static mmtk::MMTK<Ruby>) {
let mut obj_free_candidates = match self.process_type {
ProcessObjFreeCandidatesType::NonParallel => crate::binding()
.weak_proc
.non_parallel_obj_free_candidates
.try_lock()
.expect("Lock for non_parallel_obj_free_candidates should not be held"),
ProcessObjFreeCandidatesType::Parallel(idx) => {
crate::binding().weak_proc.parallel_obj_free_candidates[idx]
.try_lock()
.expect("Lock for parallel_obj_free_candidates should not be held")
}
};
let n_cands = obj_free_candidates.len();
debug!("Total: {n_cands} candidates");
// Process obj_free
let mut new_candidates = Vec::new();
for object in obj_free_candidates.iter().copied() {
if object.is_reachable() {
// Forward and add back to the candidate list.
let new_object = object.forward();
trace!("Forwarding obj_free candidate: {object} -> {new_object}");
new_candidates.push(new_object);
} else {
(upcalls().call_obj_free)(object);
}
for object in obj_free_candidates.iter().copied() {
if object.is_reachable() {
// Forward and add back to the candidate list.
let new_object = object.forward();
trace!("Forwarding obj_free candidate: {object} -> {new_object}");
new_candidates.push(new_object);
} else {
(upcalls().call_obj_free)(object);
}
}
*obj_free_candidates = new_candidates;
*obj_free_candidates = new_candidates;
}
struct ProcessParallelObjFreeCandidates {
index: usize,
}
impl GCWork<Ruby> for ProcessParallelObjFreeCandidates {
fn do_work(&mut self, _worker: &mut GCWorker<Ruby>, _mmtk: &'static mmtk::MMTK<Ruby>) {
let mut obj_free_candidates = crate::binding().weak_proc.parallel_obj_free_candidates
[self.index]
.try_lock()
.expect("Lock for parallel_obj_free_candidates should not be held");
process_obj_free_candidates(&mut obj_free_candidates);
}
}
struct ProcessNonParallelObjFreeCanadidates;
impl GCWork<Ruby> for ProcessNonParallelObjFreeCanadidates {
fn do_work(&mut self, _worker: &mut GCWorker<Ruby>, _mmtk: &'static mmtk::MMTK<Ruby>) {
let mut obj_free_candidates = crate::binding()
.weak_proc
.non_parallel_obj_free_candidates
.try_lock()
.expect("Lock for non_parallel_obj_free_candidates should not be held");
process_obj_free_candidates(&mut obj_free_candidates);
}
}