src/hotspot/share/gc/g1/g1CollectedHeap.cpp

rev 52437 : [mq]: webrev.0
rev 52438 : [mq]: webrev.1
rev 52439 : [mq]: webrev.2_reserved_page_size

*** 1568,1589 ****
                                                                   size_t size,
                                                                   size_t translation_factor) {
    size_t preferred_page_size = os::page_size_for_region_unaligned(size, 1);
    // Allocate a new reserved space, preferring to use large pages.
    ReservedSpace rs(size, preferred_page_size);
    G1RegionToSpaceMapper* result  =
      G1RegionToSpaceMapper::create_mapper(rs,
                                           size,
!                                          rs.alignment(),
                                           HeapRegion::GrainBytes,
                                           translation_factor,
                                           mtGC);
  
    os::trace_page_sizes_for_requested_size(description,
                                            size,
                                            preferred_page_size,
!                                           rs.alignment(),
                                            rs.base(),
                                            rs.size());
  
    return result;
  }
--- 1568,1590 ----
                                                                   size_t size,
                                                                   size_t translation_factor) {
    size_t preferred_page_size = os::page_size_for_region_unaligned(size, 1);
    // Allocate a new reserved space, preferring to use large pages.
    ReservedSpace rs(size, preferred_page_size);
+   size_t page_size = rs.actual_page_size();
    G1RegionToSpaceMapper* result  =
      G1RegionToSpaceMapper::create_mapper(rs,
                                           size,
!                                          page_size,
                                           HeapRegion::GrainBytes,
                                           translation_factor,
                                           mtGC);
  
    os::trace_page_sizes_for_requested_size(description,
                                            size,
                                            preferred_page_size,
!                                           page_size,
                                            rs.base(),
                                            rs.size());
  
    return result;
  }
*** 1656,1666 ****
    // Create the hot card cache.
    _hot_card_cache = new G1HotCardCache(this);
  
    // Carve out the G1 part of the heap.
    ReservedSpace g1_rs = heap_rs.first_part(max_byte_size);
!   size_t page_size = UseLargePages ? os::large_page_size() : os::vm_page_size();
    G1RegionToSpaceMapper* heap_storage =
      G1RegionToSpaceMapper::create_mapper(g1_rs,
                                           g1_rs.size(),
                                           page_size,
                                           HeapRegion::GrainBytes,
--- 1657,1667 ----
    // Create the hot card cache.
    _hot_card_cache = new G1HotCardCache(this);
  
    // Carve out the G1 part of the heap.
    ReservedSpace g1_rs = heap_rs.first_part(max_byte_size);
!   size_t page_size = heap_rs.actual_page_size();
    G1RegionToSpaceMapper* heap_storage =
      G1RegionToSpaceMapper::create_mapper(g1_rs,
                                           g1_rs.size(),
                                           page_size,
                                           HeapRegion::GrainBytes,