Merge
This commit is contained in:
commit
7e5bce7e90
@ -3106,6 +3106,8 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
|
|||||||
SvcGCMarker sgcm(SvcGCMarker::MINOR);
|
SvcGCMarker sgcm(SvcGCMarker::MINOR);
|
||||||
ResourceMark rm;
|
ResourceMark rm;
|
||||||
|
|
||||||
|
g1_policy()->note_gc_start();
|
||||||
|
|
||||||
wait_for_root_region_scanning();
|
wait_for_root_region_scanning();
|
||||||
|
|
||||||
print_heap_before_gc();
|
print_heap_before_gc();
|
||||||
@ -3165,8 +3167,6 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
|
|||||||
Threads::number_of_non_daemon_threads());
|
Threads::number_of_non_daemon_threads());
|
||||||
workers()->set_active_workers(active_workers);
|
workers()->set_active_workers(active_workers);
|
||||||
|
|
||||||
g1_policy()->note_gc_start();
|
|
||||||
|
|
||||||
TraceCollectorStats tcs(g1mm()->incremental_collection_counters());
|
TraceCollectorStats tcs(g1mm()->incremental_collection_counters());
|
||||||
TraceMemoryManagerStats tms(false /* fullGC */, gc_cause());
|
TraceMemoryManagerStats tms(false /* fullGC */, gc_cause());
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user