Skip to content

Commit 38fa9f9

Browse files
committed
spawn_gc_thread API change
1 parent 66dbe55 commit 38fa9f9

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
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
@@ -31,7 +31,7 @@ lazy_static = "1.1"
3131
# - change branch
3232
# - change repo name
3333
# But other changes including adding/removing whitespaces in commented lines may break the CI
34-
mmtk = { git = "https://github.com/wks/mmtk-core.git", rev="7cb0b2c12be341c084e03f2cd943fad8ac088f83" }
34+
mmtk = { git = "https://github.com/wks/mmtk-core.git", rev="fb752a41c67fb3a3f4ea7223c11acf099eb20131" }
3535
# Uncomment the following to build locally
3636
# mmtk = { path = "../repos/mmtk-core" }
3737
log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }

mmtk/src/collection.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use crate::{SINGLETON, UPCALLS};
33
use log::{info, trace};
44
use mmtk::util::alloc::AllocationError;
55
use mmtk::util::opaque_pointer::*;
6+
use mmtk::vm::gc_thread::UnimplementedGCThreadJoinHandle;
67
use mmtk::vm::{Collection, GCThreadContext};
78
use mmtk::Mutator;
89
use std::sync::atomic::{AtomicBool, AtomicIsize, AtomicU64, Ordering};
@@ -71,7 +72,10 @@ impl Collection<JuliaVM> for VMCollection {
7172
info!("Finished blocking mutator for GC!");
7273
}
7374

74-
fn spawn_gc_thread(_tls: VMThread, ctx: GCThreadContext<JuliaVM>) {
75+
fn spawn_gc_thread(
76+
_tls: VMThread,
77+
ctx: GCThreadContext<JuliaVM>,
78+
) -> UnimplementedGCThreadJoinHandle {
7579
// Just drop the join handle. The thread will run until the process quits.
7680
let _ = std::thread::spawn(move || {
7781
use mmtk::util::opaque_pointer::*;
@@ -85,6 +89,8 @@ impl Collection<JuliaVM> for VMCollection {
8589
}
8690
}
8791
});
92+
93+
UnimplementedGCThreadJoinHandle
8894
}
8995

9096
fn schedule_finalization(_tls: VMWorkerThread) {}

mmtk/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ extern crate lazy_static;
66

77
use mmtk::util::opaque_pointer::*;
88
use mmtk::util::Address;
9+
use mmtk::vm::gc_thread::UnimplementedGCThreadJoinHandle;
910
use mmtk::vm::VMBinding;
1011
use mmtk::MMTKBuilder;
1112
use mmtk::MMTK;
@@ -48,6 +49,8 @@ impl VMBinding for JuliaVM {
4849
type VMReferenceGlue = reference_glue::VMReferenceGlue;
4950
type VMMemorySlice = edges::JuliaMemorySlice;
5051
type VMEdge = JuliaVMEdge;
52+
53+
type VMGCThreadJoinHandle = UnimplementedGCThreadJoinHandle;
5154
}
5255

5356
/// This is used to ensure we initialize MMTk at a specified timing.

0 commit comments

Comments
 (0)