comparison src/share/vm/gc_interface/gcCause.cpp @ 23660:b5f3a471e646

Merge.
author Doug Simon <doug.simon@oracle.com>
date Wed, 01 Jun 2016 00:11:44 +0200
parents 7848fc12602b 047a642c9729
children
comparison
equal deleted inserted replaced
23411:d7cf78885a3a 23660:b5f3a471e646
52 return "Heap Dump Initiated GC"; 52 return "Heap Dump Initiated GC";
53 53
54 case _wb_young_gc: 54 case _wb_young_gc:
55 return "WhiteBox Initiated Young GC"; 55 return "WhiteBox Initiated Young GC";
56 56
57 case _wb_conc_mark:
58 return "WhiteBox Initiated Concurrent Mark";
59
57 case _update_allocation_context_stats_inc: 60 case _update_allocation_context_stats_inc:
58 case _update_allocation_context_stats_full: 61 case _update_allocation_context_stats_full:
59 return "Update Allocation Context Stats"; 62 return "Update Allocation Context Stats";
60 63
61 case _no_gc: 64 case _no_gc: