src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp

rev 6540 : 8054819: Rename HeapRegionSeq to HeapRegionManager
Reviewed-by: jwilhelm, jmasa

*** 28,65 ****
  #include "gc_implementation/g1/concurrentMark.hpp"
  #include "gc_implementation/g1/g1CollectedHeap.hpp"
  #include "gc_implementation/g1/g1AllocRegion.inline.hpp"
  #include "gc_implementation/g1/g1CollectorPolicy.hpp"
  #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc_implementation/g1/heapRegionSet.inline.hpp"
- #include "gc_implementation/g1/heapRegionSeq.inline.hpp"
  #include "runtime/orderAccess.inline.hpp"
  #include "utilities/taskqueue.hpp"
  
  // Inline functions for G1CollectedHeap
  
  // Return the region with the given index. It assumes the index is valid.
! inline HeapRegion* G1CollectedHeap::region_at(uint index) const { return _hrs.at(index); }
  
  inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const {
    assert(is_in_reserved(addr),
           err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")",
                   p2i(addr), p2i(_reserved.start()), p2i(_reserved.end())));
    return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes);
  }
  
  inline HeapWord* G1CollectedHeap::bottom_addr_for_region(uint index) const {
!   return _hrs.reserved().start() + index * HeapRegion::GrainWords;
  }
  
  template <class T>
  inline HeapRegion* G1CollectedHeap::heap_region_containing_raw(const T addr) const {
    assert(addr != NULL, "invariant");
    assert(is_in_g1_reserved((const void*) addr),
        err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")",
            p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end())));
!   return _hrs.addr_to_region((HeapWord*) addr);
  }
  
  template <class T>
  inline HeapRegion* G1CollectedHeap::heap_region_containing(const T addr) const {
    HeapRegion* hr = heap_region_containing_raw(addr);
--- 28,65 ----
  #include "gc_implementation/g1/concurrentMark.hpp"
  #include "gc_implementation/g1/g1CollectedHeap.hpp"
  #include "gc_implementation/g1/g1AllocRegion.inline.hpp"
  #include "gc_implementation/g1/g1CollectorPolicy.hpp"
  #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+ #include "gc_implementation/g1/heapRegionManager.inline.hpp"
  #include "gc_implementation/g1/heapRegionSet.inline.hpp"
  #include "runtime/orderAccess.inline.hpp"
  #include "utilities/taskqueue.hpp"
  
  // Inline functions for G1CollectedHeap
  
  // Return the region with the given index. It assumes the index is valid.
! inline HeapRegion* G1CollectedHeap::region_at(uint index) const { return _hrm.at(index); }
  
  inline uint G1CollectedHeap::addr_to_region(HeapWord* addr) const {
    assert(is_in_reserved(addr),
           err_msg("Cannot calculate region index for address "PTR_FORMAT" that is outside of the heap ["PTR_FORMAT", "PTR_FORMAT")",
                   p2i(addr), p2i(_reserved.start()), p2i(_reserved.end())));
    return (uint)(pointer_delta(addr, _reserved.start(), sizeof(uint8_t)) >> HeapRegion::LogOfHRGrainBytes);
  }
  
  inline HeapWord* G1CollectedHeap::bottom_addr_for_region(uint index) const {
!   return _hrm.reserved().start() + index * HeapRegion::GrainWords;
  }
  
  template <class T>
  inline HeapRegion* G1CollectedHeap::heap_region_containing_raw(const T addr) const {
    assert(addr != NULL, "invariant");
    assert(is_in_g1_reserved((const void*) addr),
        err_msg("Address "PTR_FORMAT" is outside of the heap ranging from ["PTR_FORMAT" to "PTR_FORMAT")",
            p2i((void*)addr), p2i(g1_reserved().start()), p2i(g1_reserved().end())));
!   return _hrm.addr_to_region((HeapWord*) addr);
  }
  
  template <class T>
  inline HeapRegion* G1CollectedHeap::heap_region_containing(const T addr) const {
    HeapRegion* hr = heap_region_containing_raw(addr);
*** 85,95 ****
  inline void G1CollectedHeap::old_set_remove(HeapRegion* hr) {
    _old_set.remove(hr);
  }
  
  inline bool G1CollectedHeap::obj_in_cs(oop obj) {
!   HeapRegion* r = _hrs.addr_to_region((HeapWord*) obj);
    return r != NULL && r->in_collection_set();
  }
  
  inline HeapWord* G1CollectedHeap::attempt_allocation(size_t word_size,
                                                       unsigned int* gc_count_before_ret,
--- 85,95 ----
  inline void G1CollectedHeap::old_set_remove(HeapRegion* hr) {
    _old_set.remove(hr);
  }
  
  inline bool G1CollectedHeap::obj_in_cs(oop obj) {
!   HeapRegion* r = _hrm.addr_to_region((HeapWord*) obj);
    return r != NULL && r->in_collection_set();
  }
  
  inline HeapWord* G1CollectedHeap::attempt_allocation(size_t word_size,
                                                       unsigned int* gc_count_before_ret,