archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 18:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8055416: Several vm/gc/heap/summary "After GC" events emitted for the same GC ID

Browse source 
Reviewed-by: brutisso, ehelin
This commit is contained in:
Stefan Karlsson 2014-08-25 09:10:13 +02:00
parent 9d6f18c297
commit 2bf343ea50
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
View file

@ -1867,6 +1867,7 @@ G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) :
_old_marking_cycles_started(0), _old_marking_cycles_started(0),
_old_marking_cycles_completed(0), _old_marking_cycles_completed(0),
_concurrent_cycle_started(false), _concurrent_cycle_started(false),
_heap_summary_sent(false),
_in_cset_fast_test(), _in_cset_fast_test(),
_dirty_cards_region_list(NULL), _dirty_cards_region_list(NULL),
_worker_cset_start_region(NULL), _worker_cset_start_region(NULL),
@ -2445,13 +2446,24 @@ void G1CollectedHeap::register_concurrent_cycle_end() {
_gc_timer_cm->register_gc_end(); _gc_timer_cm->register_gc_end();
_gc_tracer_cm->report_gc_end(_gc_timer_cm->gc_end(), _gc_timer_cm->time_partitions()); _gc_tracer_cm->report_gc_end(_gc_timer_cm->gc_end(), _gc_timer_cm->time_partitions());
// Clear state variables to prepare for the next concurrent cycle.
_concurrent_cycle_started = false; _concurrent_cycle_started = false;
_heap_summary_sent = false;
} }
} }
void G1CollectedHeap::trace_heap_after_concurrent_cycle() { void G1CollectedHeap::trace_heap_after_concurrent_cycle() {
if (_concurrent_cycle_started) { if (_concurrent_cycle_started) {
// This function can be called when:
// the cleanup pause is run
// the concurrent cycle is aborted before the cleanup pause.
// the concurrent cycle is aborted after the cleanup pause,
// but before the concurrent cycle end has been registered.
// Make sure that we only send the heap information once.
if (!_heap_summary_sent) {
trace_heap_after_gc(_gc_tracer_cm); trace_heap_after_gc(_gc_tracer_cm);
_heap_summary_sent = true;
}
} }
} }

1
hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
View file

@ -415,6 +415,7 @@ private:
volatile unsigned int _old_marking_cycles_completed; volatile unsigned int _old_marking_cycles_completed;
bool _concurrent_cycle_started; bool _concurrent_cycle_started;
bool _heap_summary_sent;
// This is a non-product method that is helpful for testing. It is // This is a non-product method that is helpful for testing. It is
// called at the end of a GC and artificially expands the heap by // called at the end of a GC and artificially expands the heap by