agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java

rev 7211 : [mq]: remove_ngen
rev 7213 : imported patch move_genspecs

*** 35,45 ****
  
  public class GenCollectedHeap extends SharedHeap {
    private static CIntegerField nGensField;
    private static AddressField youngGenField;
    private static AddressField oldGenField;
!   private static AddressField genSpecsField;
  
    private static GenerationFactory genFactory;
  
    static {
      VM.registerVMInitializedObserver(new Observer() {
--- 35,47 ----
  
  public class GenCollectedHeap extends SharedHeap {
    private static CIntegerField nGensField;
    private static AddressField youngGenField;
    private static AddressField oldGenField;
! 
!   private static AddressField youngGenSpecField;
!   private static AddressField oldGenSpecField;
  
    private static GenerationFactory genFactory;
  
    static {
      VM.registerVMInitializedObserver(new Observer() {
*** 53,65 ****
      Type type = db.lookupType("GenCollectedHeap");
  
      nGensField = type.getCIntegerField("_n_gens");
      youngGenField = type.getAddressField("_young_gen");
      oldGenField = type.getAddressField("_old_gen");
-     genSpecsField = type.getAddressField("_gen_specs");
  
      genFactory = new GenerationFactory();
    }
  
    public GenCollectedHeap(Address addr) {
      super(addr);
    }
--- 55,70 ----
      Type type = db.lookupType("GenCollectedHeap");
  
      nGensField = type.getCIntegerField("_n_gens");
      youngGenField = type.getAddressField("_young_gen");
      oldGenField = type.getAddressField("_old_gen");
  
      genFactory = new GenerationFactory();
+ 
+     Type colPolType = db.lookupType("GenCollectorPolicy");
+     youngGenSpecField = colPolType.getAddressField("_young_gen_spec");
+     oldGenSpecField = colPolType.getAddressField("_old_gen_spec");
    }
  
    public GenCollectedHeap(Address addr) {
      super(addr);
    }
*** 121,137 ****
  
      if ((level < 0) || (level >= nGens())) {
        return null;
      }
  
!     Address ptrList = genSpecsField.getValue(addr);
!     if (ptrList == null) {
!       return null;
!     }
      return (GenerationSpec)
        VMObjectFactory.newObject(GenerationSpec.class,
!                                 ptrList.getAddressAt(level * VM.getVM().getAddressSize()));
    }
  
    public CollectedHeapName kind() {
      return CollectedHeapName.GEN_COLLECTED_HEAP;
    }
--- 126,144 ----
  
      if ((level < 0) || (level >= nGens())) {
        return null;
      }
  
!     if (level == 0) {
        return (GenerationSpec)
                VMObjectFactory.newObject(GenerationSpec.class,
!                       youngGenSpecField.getAddress());
!     } else {
!       return (GenerationSpec)
!               VMObjectFactory.newObject(GenerationSpec.class,
!                       oldGenSpecField.getAddress());
!     }
    }
  
    public CollectedHeapName kind() {
      return CollectedHeapName.GEN_COLLECTED_HEAP;
    }