1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp Tue Sep 16 11:03:19 2014 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp Tue Sep 16 14:27:40 2014 +0200
1.3 @@ -4736,7 +4736,7 @@
1.4 }
1.5
1.6 bool G1PrintRegionLivenessInfoClosure::doHeapRegion(HeapRegion* r) {
1.7 - const char* type = "";
1.8 + const char* type = r->get_type_str();
1.9 HeapWord* bottom = r->bottom();
1.10 HeapWord* end = r->end();
1.11 size_t capacity_bytes = r->capacity();
1.12 @@ -4747,15 +4747,7 @@
1.13 size_t remset_bytes = r->rem_set()->mem_size();
1.14 size_t strong_code_roots_bytes = r->rem_set()->strong_code_roots_mem_size();
1.15
1.16 - if (r->used() == 0) {
1.17 - type = "FREE";
1.18 - } else if (r->is_survivor()) {
1.19 - type = "SURV";
1.20 - } else if (r->is_young()) {
1.21 - type = "EDEN";
1.22 - } else if (r->startsHumongous()) {
1.23 - type = "HUMS";
1.24 -
1.25 + if (r->startsHumongous()) {
1.26 assert(_hum_used_bytes == 0 && _hum_capacity_bytes == 0 &&
1.27 _hum_prev_live_bytes == 0 && _hum_next_live_bytes == 0,
1.28 "they should have been zeroed after the last time we used them");
1.29 @@ -4768,12 +4760,9 @@
1.30 &prev_live_bytes, &next_live_bytes);
1.31 end = bottom + HeapRegion::GrainWords;
1.32 } else if (r->continuesHumongous()) {
1.33 - type = "HUMC";
1.34 get_hum_bytes(&used_bytes, &capacity_bytes,
1.35 &prev_live_bytes, &next_live_bytes);
1.36 assert(end == bottom + HeapRegion::GrainWords, "invariant");
1.37 - } else {
1.38 - type = "OLD";
1.39 }
1.40
1.41 _total_used_bytes += used_bytes;
