agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java

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

*** 41,52 ****
  import sun.jvm.hotspot.types.TypeDataBase;
  
  // Mirror class for G1CollectedHeap.
  
  public class G1CollectedHeap extends SharedHeap {
!     // HeapRegionSeq _seq;
!     static private long hrsFieldOffset;
      // MemRegion _g1_reserved;
      static private long g1ReservedFieldOffset;
      // size_t _summary_bytes_used;
      static private CIntegerField summaryBytesUsedField;
      // G1MonitoringSupport* _g1mm;
--- 41,52 ----
  import sun.jvm.hotspot.types.TypeDataBase;
  
  // Mirror class for G1CollectedHeap.
  
  public class G1CollectedHeap extends SharedHeap {
!     // HeapRegionManager _hrm;
!     static private long hrmFieldOffset;
      // MemRegion _g1_reserved;
      static private long g1ReservedFieldOffset;
      // size_t _summary_bytes_used;
      static private CIntegerField summaryBytesUsedField;
      // G1MonitoringSupport* _g1mm;
*** 65,97 ****
      }
  
      static private synchronized void initialize(TypeDataBase db) {
          Type type = db.lookupType("G1CollectedHeap");
  
!         hrsFieldOffset = type.getField("_hrs").getOffset();
          summaryBytesUsedField = type.getCIntegerField("_summary_bytes_used");
          g1mmField = type.getAddressField("_g1mm");
          oldSetFieldOffset = type.getField("_old_set").getOffset();
          humongousSetFieldOffset = type.getField("_humongous_set").getOffset();
      }
  
      public long capacity() {
!         return hrs().capacity();
      }
  
      public long used() {
          return summaryBytesUsedField.getValue(addr);
      }
  
      public long n_regions() {
!         return hrs().length();
      }
  
!     private HeapRegionSeq hrs() {
!         Address hrsAddr = addr.addOffsetTo(hrsFieldOffset);
!         return (HeapRegionSeq) VMObjectFactory.newObject(HeapRegionSeq.class,
!                                                          hrsAddr);
      }
  
      public G1MonitoringSupport g1mm() {
          Address g1mmAddr = g1mmField.getValue(addr);
          return (G1MonitoringSupport) VMObjectFactory.newObject(G1MonitoringSupport.class, g1mmAddr);
--- 65,97 ----
      }
  
      static private synchronized void initialize(TypeDataBase db) {
          Type type = db.lookupType("G1CollectedHeap");
  
!         hrmFieldOffset = type.getField("_hrm").getOffset();
          summaryBytesUsedField = type.getCIntegerField("_summary_bytes_used");
          g1mmField = type.getAddressField("_g1mm");
          oldSetFieldOffset = type.getField("_old_set").getOffset();
          humongousSetFieldOffset = type.getField("_humongous_set").getOffset();
      }
  
      public long capacity() {
!         return hrm().capacity();
      }
  
      public long used() {
          return summaryBytesUsedField.getValue(addr);
      }
  
      public long n_regions() {
!         return hrm().length();
      }
  
!     private HeapRegionManager hrm() {
!         Address hrmAddr = addr.addOffsetTo(hrmFieldOffset);
!         return (HeapRegionManager) VMObjectFactory.newObject(HeapRegionManager.class,
!                                                          hrmAddr);
      }
  
      public G1MonitoringSupport g1mm() {
          Address g1mmAddr = g1mmField.getValue(addr);
          return (G1MonitoringSupport) VMObjectFactory.newObject(G1MonitoringSupport.class, g1mmAddr);
*** 108,118 ****
          return (HeapRegionSetBase) VMObjectFactory.newObject(HeapRegionSetBase.class,
                                                               humongousSetAddr);
      }
  
      private Iterator<HeapRegion> heapRegionIterator() {
!         return hrs().heapRegionIterator();
      }
  
      public void heapRegionIterate(SpaceClosure scl) {
          Iterator<HeapRegion> iter = heapRegionIterator();
          while (iter.hasNext()) {
--- 108,118 ----
          return (HeapRegionSetBase) VMObjectFactory.newObject(HeapRegionSetBase.class,
                                                               humongousSetAddr);
      }
  
      private Iterator<HeapRegion> heapRegionIterator() {
!         return hrm().heapRegionIterator();
      }
  
      public void heapRegionIterate(SpaceClosure scl) {
          Iterator<HeapRegion> iter = heapRegionIterator();
          while (iter.hasNext()) {