--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp Wed Dec 09 09:51:31 2015 -0500
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp Wed Dec 09 17:09:12 2015 +0000
@@ -3266,11 +3266,11 @@
// Print the per-region information.
st->cr();
- st->print_cr("Heap Regions: (E=young(eden), S=young(survivor), O=old, "
+ st->print_cr("Heap Regions: E=young(eden), S=young(survivor), O=old, "
"HS=humongous(starts), HC=humongous(continues), "
"CS=collection set, F=free, A=archive, TS=gc time stamp, "
- "PTAMS=previous top-at-mark-start, "
- "NTAMS=next top-at-mark-start)");
+ "AC=allocation context, "
+ "TAMS=top-at-mark-start (previous, next)");
PrintRegionClosure blk(st);
heap_region_iterate(&blk);
}
--- a/hotspot/src/share/vm/gc/g1/heapRegion.cpp Wed Dec 09 09:51:31 2015 -0500
+++ b/hotspot/src/share/vm/gc/g1/heapRegion.cpp Wed Dec 09 17:09:12 2015 +0000
@@ -592,17 +592,20 @@
void HeapRegion::print() const { print_on(gclog_or_tty); }
void HeapRegion::print_on(outputStream* st) const {
- st->print("AC%4u", allocation_context());
-
- st->print(" %2s", get_short_type_str());
- if (in_collection_set())
- st->print(" CS");
- else
- st->print(" ");
- st->print(" TS %5d", _gc_time_stamp);
- st->print(" PTAMS " PTR_FORMAT " NTAMS " PTR_FORMAT,
- p2i(prev_top_at_mark_start()), p2i(next_top_at_mark_start()));
- G1OffsetTableContigSpace::print_on(st);
+ st->print("|%4u", this->_hrm_index);
+ st->print("|" PTR_FORMAT ", " PTR_FORMAT ", " PTR_FORMAT,
+ p2i(bottom()), p2i(top()), p2i(end()));
+ st->print("|%3d%%", (int) ((double) used() * 100 / capacity()));
+ st->print("|%2s", get_short_type_str());
+ if (in_collection_set()) {
+ st->print("|CS");
+ } else {
+ st->print("| ");
+ }
+ st->print("|TS%3u", _gc_time_stamp);
+ st->print("|AC%3u", allocation_context());
+ st->print_cr("|TAMS " PTR_FORMAT ", " PTR_FORMAT "|",
+ p2i(prev_top_at_mark_start()), p2i(next_top_at_mark_start()));
}
class VerifyLiveClosure: public OopClosure {