Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/g1/heapRegionSet.cpp	Tue Jul 17 12:24:05 2012 -0700
     1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionSet.cpp	Thu Jul 19 15:15:54 2012 -0700
     1.3 @@ -35,14 +35,6 @@
     1.4    _unrealistically_long_length = len;
     1.5  }
     1.6  
     1.7 -uint HeapRegionSetBase::calculate_region_num(HeapRegion* hr) {
     1.8 -  assert(hr->startsHumongous(), "pre-condition");
     1.9 -  assert(hr->capacity() % HeapRegion::GrainBytes == 0, "invariant");
    1.10 -  uint region_num = (uint) (hr->capacity() >> HeapRegion::LogOfHRGrainBytes);
    1.11 -  assert(region_num > 0, "sanity");
    1.12 -  return region_num;
    1.13 -}
    1.14 -
    1.15  void HeapRegionSetBase::fill_in_ext_msg(hrs_ext_msg* msg, const char* message) {
    1.16    msg->append("[%s] %s ln: %u rn: %u cy: "SIZE_FORMAT" ud: "SIZE_FORMAT,
    1.17                name(), message, length(), region_num(),
    1.18 @@ -152,11 +144,7 @@
    1.19    guarantee(verify_region(hr, this), hrs_ext_msg(this, "region verification"));
    1.20  
    1.21    _calc_length               += 1;
    1.22 -  if (!hr->isHumongous()) {
    1.23 -    _calc_region_num         += 1;
    1.24 -  } else {
    1.25 -    _calc_region_num         += calculate_region_num(hr);
    1.26 -  }
    1.27 +  _calc_region_num           += hr->region_num();
    1.28    _calc_total_capacity_bytes += hr->capacity();
    1.29    _calc_total_used_bytes     += hr->used();
    1.30  }