changeset 6662:b2029969cc16

Merge
author coleenp
date Fri, 12 Sep 2014 01:04:04 +0000
parents ed3d653e4012 dce3f772de9f
children 7301840ea20e
files
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc_interface/gcCause.cpp	Thu Sep 04 14:50:31 2014 -0400
+++ b/src/share/vm/gc_interface/gcCause.cpp	Fri Sep 12 01:04:04 2014 +0000
@@ -54,6 +54,9 @@
     case _wb_young_gc:
       return "WhiteBox Initiated Young GC";
 
+    case _update_allocation_context_stats:
+      return "Update Allocation Context Stats";
+
     case _no_gc:
       return "No GC";
 
--- a/src/share/vm/gc_interface/gcCause.hpp	Thu Sep 04 14:50:31 2014 -0400
+++ b/src/share/vm/gc_interface/gcCause.hpp	Fri Sep 12 01:04:04 2014 +0000
@@ -47,6 +47,7 @@
     _heap_inspection,
     _heap_dump,
     _wb_young_gc,
+    _update_allocation_context_stats,
 
     /* implementation independent, but reserved for GC use */
     _no_gc,