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

rev 8719 : 8131319: Move G1Allocator::_summary_bytes_used back to G1CollectedHeap
Reviewed-by:
rev 8720 : [mq]: fix-sa-agent

*** 34,55 ****
  import sun.jvm.hotspot.gc.shared.SpaceClosure;
  import sun.jvm.hotspot.memory.MemRegion;
  import sun.jvm.hotspot.runtime.VM;
  import sun.jvm.hotspot.runtime.VMObjectFactory;
  import sun.jvm.hotspot.types.AddressField;
  import sun.jvm.hotspot.types.Type;
  import sun.jvm.hotspot.types.TypeDataBase;
  
  // Mirror class for G1CollectedHeap.
  
  public class G1CollectedHeap extends CollectedHeap {
      // HeapRegionManager _hrm;
      static private long hrmFieldOffset;
      // MemRegion _g1_reserved;
      static private long g1ReservedFieldOffset;
!     // G1Allocator* _allocator
!     static private AddressField g1Allocator;
      // G1MonitoringSupport* _g1mm;
      static private AddressField g1mmField;
      // HeapRegionSet _old_set;
      static private long oldSetFieldOffset;
      // HeapRegionSet _humongous_set;
--- 34,56 ----
  import sun.jvm.hotspot.gc.shared.SpaceClosure;
  import sun.jvm.hotspot.memory.MemRegion;
  import sun.jvm.hotspot.runtime.VM;
  import sun.jvm.hotspot.runtime.VMObjectFactory;
  import sun.jvm.hotspot.types.AddressField;
+ import sun.jvm.hotspot.types.CIntegerField;
  import sun.jvm.hotspot.types.Type;
  import sun.jvm.hotspot.types.TypeDataBase;
  
  // Mirror class for G1CollectedHeap.
  
  public class G1CollectedHeap extends CollectedHeap {
      // HeapRegionManager _hrm;
      static private long hrmFieldOffset;
      // MemRegion _g1_reserved;
      static private long g1ReservedFieldOffset;
!     // size_t _summary_bytes_used;
!     static private CIntegerField summaryBytesUsedField;
      // G1MonitoringSupport* _g1mm;
      static private AddressField g1mmField;
      // HeapRegionSet _old_set;
      static private long oldSetFieldOffset;
      // HeapRegionSet _humongous_set;
*** 65,86 ****
  
      static private synchronized void initialize(TypeDataBase db) {
          Type type = db.lookupType("G1CollectedHeap");
  
          hrmFieldOffset = type.getField("_hrm").getOffset();
!         g1Allocator = type.getAddressField("_allocator");
          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 allocator().getSummaryBytes();
      }
  
      public long n_regions() {
          return hrm().length();
      }
--- 66,87 ----
  
      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();
      }
*** 94,108 ****
      public G1MonitoringSupport g1mm() {
          Address g1mmAddr = g1mmField.getValue(addr);
          return (G1MonitoringSupport) VMObjectFactory.newObject(G1MonitoringSupport.class, g1mmAddr);
      }
  
-     public G1Allocator allocator() {
-         Address g1AllocatorAddr = g1Allocator.getValue(addr);
-         return (G1Allocator) VMObjectFactory.newObject(G1Allocator.class, g1AllocatorAddr);
-     }
- 
      public HeapRegionSetBase oldSet() {
          Address oldSetAddr = addr.addOffsetTo(oldSetFieldOffset);
          return (HeapRegionSetBase) VMObjectFactory.newObject(HeapRegionSetBase.class,
                                                               oldSetAddr);
      }
--- 95,104 ----