Skip to content

Commit 50d3702

Browse files
authored
Rename ambiguous scan_thread_root{,s} functions (mmtk#63)
1 parent f4f0247 commit 50d3702

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

mmtk/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ lazy_static = "1.1"
2929
# - change branch
3030
# - change repo name
3131
# But other changes including adding/removing whitespaces in commented lines may break the CI
32-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "2ec37bde7955304f3e4bc5f7bed3fbfba3833cc0" }
32+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "f1a0bb7fbec97dd84e35a40e8be01cf5018f2f9e" }
3333
# Uncomment the following to build locally
3434
# mmtk = { path = "../repos/mmtk-core" }
3535
log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }

mmtk/src/scanning.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@ use std::sync::MutexGuard;
2424
pub struct VMScanning {}
2525

2626
impl Scanning<JuliaVM> for VMScanning {
27-
fn scan_thread_roots(_tls: VMWorkerThread, _factory: impl RootsWorkFactory<JuliaVMEdge>) {
27+
fn scan_roots_in_all_mutator_threads(
28+
_tls: VMWorkerThread,
29+
_factory: impl RootsWorkFactory<JuliaVMEdge>,
30+
) {
2831
// Thread roots are collected by Julia before stopping the world
2932
}
3033

31-
fn scan_thread_root(
34+
fn scan_roots_in_mutator_thread(
3235
_tls: VMWorkerThread,
3336
_mutator: &'static mut Mutator<JuliaVM>,
3437
_factory: impl RootsWorkFactory<JuliaVMEdge>,

0 commit comments

Comments
 (0)