diff 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
line wrap: on
line diff
--- a/src/share/vm/gc_interface/gcCause.cpp	Tue May 31 08:05:44 2016 +0200
+++ b/src/share/vm/gc_interface/gcCause.cpp	Wed Jun 01 00:11:44 2016 +0200
@@ -54,6 +54,9 @@
     case _wb_young_gc:
       return "WhiteBox Initiated Young GC";
 
+    case _wb_conc_mark:
+      return "WhiteBox Initiated Concurrent Mark";
+
     case _update_allocation_context_stats_inc:
     case _update_allocation_context_stats_full:
       return "Update Allocation Context Stats";