stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8058568: GC cleanup phase can cause G1 skipping a System.gc()

Browse Source 
Marking G1 FullGC as a _full collection and passing down the correct before count.

Reviewed-by: brutisso, mgerdin
This commit is contained in:
Stefan Johansson 2014-10-20 10:18:17 +02:00
parent 71edbb2d96
commit bd227a9bac
2 changed files with 4 additions and 2 deletions
hotspot/src/share/vm/gc_implementation/g1
g1CollectedHeap.cppvm_operations_g1.hpp

4
hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp

@ -2483,6 +2483,7 @@ void G1CollectedHeap::collect(GCCause::Cause cause) {
unsigned int gc_count_before;
unsigned int old_marking_count_before;
unsigned int full_gc_count_before;
bool retry_gc;
do {
@ -2493,6 +2494,7 @@ void G1CollectedHeap::collect(GCCause::Cause cause) {
// Read the GC count while holding the Heap_lock
gc_count_before = total_collections();
full_gc_count_before = total_full_collections();
old_marking_count_before = _old_marking_cycles_started;
}
@ -2537,7 +2539,7 @@ void G1CollectedHeap::collect(GCCause::Cause cause) {
VMThread::execute(&op);
} else {
// Schedule a Full GC.
VM_G1CollectFull op(gc_count_before, old_marking_count_before, cause);
VM_G1CollectFull op(gc_count_before, full_gc_count_before, cause);
VMThread::execute(&op);
}
}

2
hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp

@ -60,7 +60,7 @@ public:
VM_G1CollectFull(unsigned int gc_count_before,
unsigned int full_gc_count_before,
GCCause::Cause cause)
: VM_GC_Operation(gc_count_before, cause, full_gc_count_before) { }
: VM_GC_Operation(gc_count_before, cause, full_gc_count_before, true) { }
virtual VMOp_Type type() const { return VMOp_G1CollectFull; }
virtual void doit();
virtual const char* name() const {