comparison src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp @ 20804:7848fc12602b

Merge with jdk8u40-b25
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 14:58:49 +0200
parents 4bfc44ba0d19
children fb69749583e8
comparison
equal deleted inserted replaced
20184:84105dcdb05b 20804:7848fc12602b
68 ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap(); 68 ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
69 assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, 69 assert(heap->kind() == CollectedHeap::ParallelScavengeHeap,
70 "must be a ParallelScavengeHeap"); 70 "must be a ParallelScavengeHeap");
71 71
72 GCCauseSetter gccs(heap, _gc_cause); 72 GCCauseSetter gccs(heap, _gc_cause);
73 if (_gc_cause == GCCause::_gc_locker 73 if (_gc_cause == GCCause::_gc_locker || _gc_cause == GCCause::_wb_young_gc
74 DEBUG_ONLY(|| _gc_cause == GCCause::_scavenge_alot)) { 74 DEBUG_ONLY(|| _gc_cause == GCCause::_scavenge_alot)) {
75 // If (and only if) the scavenge fails, this will invoke a full gc. 75 // If (and only if) the scavenge fails, this will invoke a full gc.
76 heap->invoke_scavenge(); 76 heap->invoke_scavenge();
77 } else { 77 } else {
78 heap->do_full_collection(false); 78 heap->do_full_collection(false);