infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8369809: G1: Merge G1CollectedHeap::do_collection_pause_at_safepoint[_helper]

Browse Source 
Reviewed-by: ayang, iwalulya
This commit is contained in:
Thomas Schatzl 2025-10-15 11:25:31 +00:00
parent c53ab10dae
commit 159452e85a
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hotspot/share/gc/g1/g1CollectedHeap.cpp
View File

@ -2567,13 +2567,6 @@ void G1CollectedHeap::verify_after_young_collection(G1HeapVerifier::G1VerifyType
phase_times()->record_verify_after_time_ms((Ticks::now() - start).seconds() * MILLIUNITS);
}
void G1CollectedHeap::do_collection_pause_at_safepoint(size_t allocation_word_size) {
assert_at_safepoint_on_vm_thread();
guarantee(!is_stw_gc_active(), "collection is not reentrant");
do_collection_pause_at_safepoint_helper(allocation_word_size);
}
G1HeapPrinterMark::G1HeapPrinterMark(G1CollectedHeap* g1h) : _g1h(g1h), _heap_transition(g1h) {
// This summary needs to be printed before incrementing total collections.
_g1h->rem_set()->print_periodic_summary_info("Before GC RS summary",
@ -2635,7 +2628,10 @@ void G1CollectedHeap::flush_region_pin_cache() {
}
}
void G1CollectedHeap::do_collection_pause_at_safepoint_helper(size_t allocation_word_size) {
void G1CollectedHeap::do_collection_pause_at_safepoint(size_t allocation_word_size) {
assert_at_safepoint_on_vm_thread();
assert(!is_stw_gc_active(), "collection is not reentrant");
ResourceMark rm;
IsSTWGCActiveMark active_gc_mark;

4
src/hotspot/share/gc/g1/g1CollectedHeap.hpp
View File

@ -769,10 +769,6 @@ private:
// precondition: !is_stw_gc_active()
void do_collection_pause_at_safepoint(size_t allocation_word_size = 0);
// Helper for do_collection_pause_at_safepoint, containing the guts
// of the incremental collection pause, executed by the vm thread.
void do_collection_pause_at_safepoint_helper(size_t allocation_word_size);
void verify_before_young_collection(G1HeapVerifier::G1VerifyType type);
void verify_after_young_collection(G1HeapVerifier::G1VerifyType type);