changeset 7448:5d8c71ac66b0

Include addition output in ShenandoahHeap::print_on(), include regions dump only when verbose.
author Roman Kennke <rkennke@redhat.com>
date Wed, 21 Jan 2015 13:16:36 +0100
parents 7d70accd6b5a
children ac5d21fb6715
files src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp
diffstat 1 files changed, 18 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp	Fri Jan 16 12:59:18 2015 +0100
+++ b/src/share/vm/gc_implementation/shenandoah/shenandoahHeap.cpp	Wed Jan 21 13:16:36 2015 +0100
@@ -231,8 +231,24 @@
 void ShenandoahHeap::print_on(outputStream* st) const {
   st->print("Shenandoah Heap");
   st->print(" total = " SIZE_FORMAT " K, used " SIZE_FORMAT " K ", capacity()/ K, used() /K);
-  st->print("Region size = " SIZE_FORMAT "K \n", ShenandoahHeapRegion::RegionSizeBytes / K);
-  print_heap_regions(st);
+  st->print("Region size = " SIZE_FORMAT "K ", ShenandoahHeapRegion::RegionSizeBytes / K);
+  if (_concurrent_mark_in_progress) {
+    st->print("marking ");
+  }
+  if (_evacuation_in_progress) {
+    st->print("evacuating ");
+  }
+  if (_update_references_in_progress) {
+    st->print("updating-refs ");
+  }
+  if (_cancelled_evacuation) {
+    st->print("cancelled ");
+  }
+  st->print("\n");
+
+  if (Verbose) {
+    print_heap_regions(st);
+  }
 }
 
 void ShenandoahHeap::post_initialize() {