diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock index 7cc1babe..6d3db38b 100644 --- a/mmtk/Cargo.lock +++ b/mmtk/Cargo.lock @@ -226,13 +226,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -324,19 +324,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "is-terminal" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -365,9 +365,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libgit2-sys" @@ -395,9 +395,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lock_api" @@ -436,7 +436,7 @@ dependencies = [ [[package]] name = "mmtk" version = "0.18.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=2ec37bde7955304f3e4bc5f7bed3fbfba3833cc0#2ec37bde7955304f3e4bc5f7bed3fbfba3833cc0" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=04a47feb4598b2120598453c2cceec83986c2122#04a47feb4598b2120598453c2cceec83986c2122" dependencies = [ "atomic", "atomic-traits", @@ -448,6 +448,7 @@ dependencies = [ "downcast-rs", "enum-map", "env_logger", + "is-terminal", "itertools", "lazy_static", "libc", @@ -455,6 +456,7 @@ dependencies = [ "mmtk-macros", "num-traits", "num_cpus", + "probe", "regex", "spin", "static_assertions", @@ -466,7 +468,7 @@ dependencies = [ [[package]] name = "mmtk-macros" version = "0.18.0" -source = "git+https://github.com/mmtk/mmtk-core.git?rev=2ec37bde7955304f3e4bc5f7bed3fbfba3833cc0#2ec37bde7955304f3e4bc5f7bed3fbfba3833cc0" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=04a47feb4598b2120598453c2cceec83986c2122#04a47feb4598b2120598453c2cceec83986c2122" dependencies = [ "proc-macro-error", "proc-macro2", @@ -541,6 +543,12 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +[[package]] +name = "probe" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216e81fcf486280f0b8b18ca43ceafd32739eb0eb703eb024a8d00814eeba556" + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -633,16 +641,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.8" +version = "0.37.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" dependencies = [ "bitflags", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -751,9 +759,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.0" +version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f1dc6930a439cc5d154221b5387d153f8183529b07c19aca24ea31e0a167e1" +checksum = "6b949f01f9c23823744b71e0060472ecbde578ef68cc2a9e46d114efd77c3034" dependencies = [ "cfg-if", "core-foundation-sys", @@ -904,7 +912,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.1", ] [[package]] @@ -913,13 +930,28 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -928,38 +960,80 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + [[package]] name = "windows_i686_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + [[package]] name = "windows_i686_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + [[package]] name = "windows_x86_64_gnu" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + [[package]] name = "windows_x86_64_msvc" version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 29e28a66..196f5369 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -30,7 +30,7 @@ once_cell = "1.10.0" # - change branch # - change repo name # But other changes including adding/removing whitespaces in commented lines may break the CI. -mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "f1a0bb7fbec97dd84e35a40e8be01cf5018f2f9e" } +mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "04a47feb4598b2120598453c2cceec83986c2122" } # Uncomment the following to build locally # mmtk = { path = "../repos/mmtk-core" } diff --git a/mmtk/src/collection.rs b/mmtk/src/collection.rs index f6b2cc33..776c737a 100644 --- a/mmtk/src/collection.rs +++ b/mmtk/src/collection.rs @@ -1,7 +1,7 @@ use mmtk::util::alloc::AllocationError; use mmtk::util::opaque_pointer::*; -use mmtk::vm::{Collection, GCThreadContext, Scanning, VMBinding}; -use mmtk::{Mutator, MutatorContext}; +use mmtk::vm::{Collection, GCThreadContext}; +use mmtk::Mutator; use crate::UPCALLS; use crate::{MutatorClosure, OpenJDK}; @@ -16,13 +16,9 @@ impl Collection for VMCollection { where F: FnMut(&'static mut Mutator), { - let scan_mutators_in_safepoint = - ::VMScanning::SCAN_MUTATORS_IN_SAFEPOINT; - unsafe { ((*UPCALLS).stop_all_mutators)( tls, - scan_mutators_in_safepoint, MutatorClosure::from_rust_closure(&mut mutator_visitor), ); } @@ -55,14 +51,6 @@ impl Collection for VMCollection { } } - fn prepare_mutator>( - _tls_w: VMWorkerThread, - _tls_m: VMMutatorThread, - _m: &T, - ) { - // unimplemented!() - } - fn out_of_memory(tls: VMThread, err_kind: AllocationError) { unsafe { ((*UPCALLS).out_of_memory)(tls, err_kind); diff --git a/mmtk/src/lib.rs b/mmtk/src/lib.rs index e501c64f..8c7bd9d9 100644 --- a/mmtk/src/lib.rs +++ b/mmtk/src/lib.rs @@ -75,11 +75,7 @@ pub struct EdgesClosure { #[repr(C)] pub struct OpenJDK_Upcalls { - pub stop_all_mutators: extern "C" fn( - tls: VMWorkerThread, - scan_mutators_in_safepoint: bool, - closure: MutatorClosure, - ), + pub stop_all_mutators: extern "C" fn(tls: VMWorkerThread, closure: MutatorClosure), pub resume_mutators: extern "C" fn(tls: VMWorkerThread), pub spawn_gc_thread: extern "C" fn(tls: VMThread, kind: libc::c_int, ctx: *mut libc::c_void), pub block_for_gc: extern "C" fn(), diff --git a/mmtk/src/scanning.rs b/mmtk/src/scanning.rs index aa1a5dba..9d6955d1 100644 --- a/mmtk/src/scanning.rs +++ b/mmtk/src/scanning.rs @@ -42,9 +42,6 @@ pub(crate) fn to_edges_closure>(factory: &mut F } impl Scanning for VMScanning { - const SCAN_MUTATORS_IN_SAFEPOINT: bool = false; - const SINGLE_THREAD_MUTATOR_SCANNING: bool = false; - fn scan_object>( tls: VMWorkerThread, object: ObjectReference, @@ -58,15 +55,6 @@ impl Scanning for VMScanning { // TODO } - fn scan_roots_in_all_mutator_threads( - _tls: VMWorkerThread, - mut factory: impl RootsWorkFactory, - ) { - unsafe { - ((*UPCALLS).scan_roots_in_all_mutator_threads)(to_edges_closure(&mut factory)); - } - } - fn scan_roots_in_mutator_thread( _tls: VMWorkerThread, mutator: &'static mut Mutator, @@ -94,15 +82,9 @@ impl Scanning for VMScanning { Box::new(ScanStringTableRoots::new(factory.clone())) as _, Box::new(ScanClassLoaderDataGraphRoots::new(factory.clone())) as _, Box::new(ScanWeakProcessorRoots::new(factory.clone())) as _, + Box::new(ScanVMThreadRoots::new(factory)) as _, ], ); - if !(Self::SCAN_MUTATORS_IN_SAFEPOINT && Self::SINGLE_THREAD_MUTATOR_SCANNING) { - memory_manager::add_work_packet( - &SINGLETON, - WorkBucketStage::Prepare, - ScanVMThreadRoots::new(factory), - ); - } } fn supports_return_barrier() -> bool { diff --git a/openjdk/mmtk.h b/openjdk/mmtk.h index 88c96d49..ab47acca 100644 --- a/openjdk/mmtk.h +++ b/openjdk/mmtk.h @@ -144,7 +144,7 @@ struct EdgesClosure { * OpenJDK-specific */ typedef struct { - void (*stop_all_mutators) (void *tls, bool scan_mutators_in_safepoint, MutatorClosure closure); + void (*stop_all_mutators) (void *tls, MutatorClosure closure); void (*resume_mutators) (void *tls); void (*spawn_gc_thread) (void *tls, int kind, void *ctx); void (*block_for_gc) (); diff --git a/openjdk/mmtkUpcalls.cpp b/openjdk/mmtkUpcalls.cpp index 5f1350d0..68743261 100644 --- a/openjdk/mmtkUpcalls.cpp +++ b/openjdk/mmtkUpcalls.cpp @@ -45,7 +45,7 @@ // Note: This counter must be accessed using the Atomic class. static volatile size_t mmtk_start_the_world_count = 0; -static void mmtk_stop_all_mutators(void *tls, bool scan_mutators_in_safepoint, MutatorClosure closure) { +static void mmtk_stop_all_mutators(void *tls, MutatorClosure closure) { ClassLoaderDataGraph::clear_claimed_marks(); CodeCache::gc_prologue(); #if COMPILER2_OR_JVMCI @@ -56,12 +56,11 @@ static void mmtk_stop_all_mutators(void *tls, bool scan_mutators_in_safepoint, M MMTkHeap::heap()->companion_thread()->request(MMTkVMCompanionThread::_threads_suspended, true); log_debug(gc)("Mutators stopped. Now enumerate threads for scanning..."); - if (!scan_mutators_in_safepoint) { - JavaThreadIteratorWithHandle jtiwh; - while (JavaThread *cur = jtiwh.next()) { - closure.invoke((void*)&cur->third_party_heap_mutator); - } + JavaThreadIteratorWithHandle jtiwh; + while (JavaThread *cur = jtiwh.next()) { + closure.invoke((void*)&cur->third_party_heap_mutator); } + log_debug(gc)("Finished enumerating threads."); nmethod::oops_do_marking_prologue(); }