src/share/vm/gc_implementation/g1/g1RegionToSpaceMapper.cpp

rev 6805 : imported patch commit-uncommit-within-heap
rev 6807 : imported patch bengt-suggestions
rev 6808 : imported patch mikael-review-2

*** 50,61 ****
  class G1RegionsLargerThanCommitSizeMapper : public G1RegionToSpaceMapper {
   private:
    size_t _pages_per_region;
  
   public:
!   G1RegionsLargerThanCommitSizeMapper(ReservedSpace rs, size_t os_commit_granularity,
!     size_t alloc_granularity, size_t commit_factor, MemoryType type) :
       G1RegionToSpaceMapper(rs, os_commit_granularity, alloc_granularity, type),
      _pages_per_region(alloc_granularity / (os_commit_granularity * commit_factor)) {
  
      guarantee(alloc_granularity >= os_commit_granularity, "allocation granularity smaller than commit granularity");
      _commit_map.resize(rs.size() * commit_factor / alloc_granularity, /* in_resource_area */ false);
--- 50,64 ----
  class G1RegionsLargerThanCommitSizeMapper : public G1RegionToSpaceMapper {
   private:
    size_t _pages_per_region;
  
   public:
!   G1RegionsLargerThanCommitSizeMapper(ReservedSpace rs,
!                                       size_t os_commit_granularity,
!                                       size_t alloc_granularity,
!                                       size_t commit_factor,
!                                       MemoryType type) :
       G1RegionToSpaceMapper(rs, os_commit_granularity, alloc_granularity, type),
      _pages_per_region(alloc_granularity / (os_commit_granularity * commit_factor)) {
  
      guarantee(alloc_granularity >= os_commit_granularity, "allocation granularity smaller than commit granularity");
      _commit_map.resize(rs.size() * commit_factor / alloc_granularity, /* in_resource_area */ false);
*** 139,149 ****
      _listener->on_commit(start_idx, num_regions);
    }
  }
  
  G1RegionToSpaceMapper* G1RegionToSpaceMapper::create_mapper(ReservedSpace rs,
!   size_t os_commit_granularity, size_t region_granularity, size_t commit_factor, MemoryType type) {
  
    if (region_granularity >= (os_commit_granularity * commit_factor)) {
      return new G1RegionsLargerThanCommitSizeMapper(rs, os_commit_granularity, region_granularity, commit_factor, type);
    } else {
      return new G1RegionsSmallerThanCommitSizeMapper(rs, os_commit_granularity, region_granularity, commit_factor, type);
--- 142,155 ----
      _listener->on_commit(start_idx, num_regions);
    }
  }
  
  G1RegionToSpaceMapper* G1RegionToSpaceMapper::create_mapper(ReservedSpace rs,
!                                                             size_t os_commit_granularity,
!                                                             size_t region_granularity,
!                                                             size_t commit_factor,
!                                                             MemoryType type) {
  
    if (region_granularity >= (os_commit_granularity * commit_factor)) {
      return new G1RegionsLargerThanCommitSizeMapper(rs, os_commit_granularity, region_granularity, commit_factor, type);
    } else {
      return new G1RegionsSmallerThanCommitSizeMapper(rs, os_commit_granularity, region_granularity, commit_factor, type);