Skip to content

Commit f1a0bb7

Browse files
authored
Rename ambiguous scan_thread_root{,s} functions (#846)
Closes #601.
1 parent bbf5f49 commit f1a0bb7

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/scheduler/gc_work.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ impl<E: ProcessEdgesWork> GCWork<E::VM> for ScanStackRoots<E> {
444444
fn do_work(&mut self, worker: &mut GCWorker<E::VM>, mmtk: &'static MMTK<E::VM>) {
445445
trace!("ScanStackRoots");
446446
let factory = ProcessEdgesWorkRootsWorkFactory::<E>::new(mmtk);
447-
<E::VM as VMBinding>::VMScanning::scan_thread_roots(worker.tls, factory);
447+
<E::VM as VMBinding>::VMScanning::scan_roots_in_all_mutator_threads(worker.tls, factory);
448448
<E::VM as VMBinding>::VMScanning::notify_initial_thread_scan_complete(false, worker.tls);
449449
for mutator in <E::VM as VMBinding>::VMActivePlan::mutators() {
450450
mutator.flush();
@@ -461,7 +461,7 @@ impl<E: ProcessEdgesWork> GCWork<E::VM> for ScanStackRoot<E> {
461461
let base = &mmtk.plan.base();
462462
let mutators = <E::VM as VMBinding>::VMActivePlan::number_of_mutators();
463463
let factory = ProcessEdgesWorkRootsWorkFactory::<E>::new(mmtk);
464-
<E::VM as VMBinding>::VMScanning::scan_thread_root(
464+
<E::VM as VMBinding>::VMScanning::scan_roots_in_mutator_thread(
465465
worker.tls,
466466
unsafe { &mut *(self.0 as *mut _) },
467467
factory,

src/vm/scanning.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,18 @@ pub trait Scanning<VM: VMBinding> {
200200
/// Arguments:
201201
/// * `tls`: The GC thread that is performing this scanning.
202202
/// * `factory`: The VM uses it to create work packets for scanning roots.
203-
fn scan_thread_roots(tls: VMWorkerThread, factory: impl RootsWorkFactory<VM::VMEdge>);
203+
fn scan_roots_in_all_mutator_threads(
204+
tls: VMWorkerThread,
205+
factory: impl RootsWorkFactory<VM::VMEdge>,
206+
);
204207

205208
/// Scan one mutator for roots.
206209
///
207210
/// Arguments:
208211
/// * `tls`: The GC thread that is performing this scanning.
209212
/// * `mutator`: The reference to the mutator whose roots will be scanned.
210213
/// * `factory`: The VM uses it to create work packets for scanning roots.
211-
fn scan_thread_root(
214+
fn scan_roots_in_mutator_thread(
212215
tls: VMWorkerThread,
213216
mutator: &'static mut Mutator<VM>,
214217
factory: impl RootsWorkFactory<VM::VMEdge>,

vmbindings/dummyvm/src/scanning.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ use mmtk::Mutator;
1010
pub struct VMScanning {}
1111

1212
impl Scanning<DummyVM> for VMScanning {
13-
fn scan_thread_roots(_tls: VMWorkerThread, _factory: impl RootsWorkFactory<DummyVMEdge>) {
13+
fn scan_roots_in_all_mutator_threads(_tls: VMWorkerThread, _factory: impl RootsWorkFactory<DummyVMEdge>) {
1414
unimplemented!()
1515
}
16-
fn scan_thread_root(
16+
fn scan_roots_in_mutator_thread(
1717
_tls: VMWorkerThread,
1818
_mutator: &'static mut Mutator<DummyVM>,
1919
_factory: impl RootsWorkFactory<DummyVMEdge>,

0 commit comments

Comments
 (0)