src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp

rev 56323 : imported patch 8220310.mut.0
rev 56324 : imported patch 8220310.mut.1_thomas
rev 56326 : [mq]: 8220310.mut.1-3_kim

*** 23,32 ****
--- 23,33 ----
   */
  
  #ifndef SHARE_GC_G1_G1REGIONTOSPACEMAPPER_HPP
  #define SHARE_GC_G1_G1REGIONTOSPACEMAPPER_HPP
  
+ #include "gc/g1/g1MemoryNodeManager.hpp"
  #include "gc/g1/g1PageBasedVirtualSpace.hpp"
  #include "memory/allocation.hpp"
  #include "utilities/debug.hpp"
  
  class WorkGang;
*** 69,79 ****
    bool is_committed(uintptr_t idx) const {
      return _commit_map.at(idx);
    }
  
    void commit_and_set_special();
!   virtual void commit_regions(uint start_idx, size_t num_regions = 1, WorkGang* pretouch_workers = NULL) = 0;
    virtual void uncommit_regions(uint start_idx, size_t num_regions = 1) = 0;
  
    // Creates an appropriate G1RegionToSpaceMapper for the given parameters.
    // The actual space to be used within the given reservation is given by actual_size.
    // This is because some OSes need to round up the reservation size to guarantee
--- 70,83 ----
    bool is_committed(uintptr_t idx) const {
      return _commit_map.at(idx);
    }
  
    void commit_and_set_special();
!   virtual void commit_regions(uint start_idx,
!                               size_t num_regions = 1,
!                               uint node_index = G1MemoryNodeManager::AnyNodeIndex,
!                               WorkGang* pretouch_workers = NULL) = 0;
    virtual void uncommit_regions(uint start_idx, size_t num_regions = 1) = 0;
  
    // Creates an appropriate G1RegionToSpaceMapper for the given parameters.
    // The actual space to be used within the given reservation is given by actual_size.
    // This is because some OSes need to round up the reservation size to guarantee
*** 114,122 ****
    G1RegionToHeteroSpaceMapper(ReservedSpace rs, size_t used_size, size_t page_size, size_t region_granularity, size_t commit_factor, MemoryType type);
    bool initialize();
    uint num_committed_dram() const;
    uint num_committed_nvdimm() const;
  
!   virtual void commit_regions(uint start_idx, size_t num_regions = 1, WorkGang* pretouch_workers = NULL);
    virtual void uncommit_regions(uint start_idx, size_t num_regions = 1);
  };
  #endif // SHARE_GC_G1_G1REGIONTOSPACEMAPPER_HPP
--- 118,129 ----
    G1RegionToHeteroSpaceMapper(ReservedSpace rs, size_t used_size, size_t page_size, size_t region_granularity, size_t commit_factor, MemoryType type);
    bool initialize();
    uint num_committed_dram() const;
    uint num_committed_nvdimm() const;
  
!   virtual void commit_regions(uint start_idx,
!                               size_t num_regions = 1,
!                               uint node_index = G1MemoryNodeManager::AnyNodeIndex,
!                               WorkGang* pretouch_workers = NULL);
    virtual void uncommit_regions(uint start_idx, size_t num_regions = 1);
  };
  #endif // SHARE_GC_G1_G1REGIONTOSPACEMAPPER_HPP