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

rev 56812 : imported patch 8189737-stefanj-review

*** 28,42 ****
  import java.util.Iterator;
  import java.util.Observable;
  import java.util.Observer;
  
  import sun.jvm.hotspot.debugger.Address;
  import sun.jvm.hotspot.gc.shared.CollectedHeap;
  import sun.jvm.hotspot.gc.shared.CollectedHeapName;
  import sun.jvm.hotspot.gc.shared.LiveRegionsClosure;
- import sun.jvm.hotspot.gc.shared.PrintRegionClosure;
- 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;
--- 28,42 ----
  import java.util.Iterator;
  import java.util.Observable;
  import java.util.Observer;
  
  import sun.jvm.hotspot.debugger.Address;
+ import sun.jvm.hotspot.gc.g1.HeapRegionClosure;
+ import sun.jvm.hotspot.gc.g1.PrintRegionClosure;
  import sun.jvm.hotspot.gc.shared.CollectedHeap;
  import sun.jvm.hotspot.gc.shared.CollectedHeapName;
  import sun.jvm.hotspot.gc.shared.LiveRegionsClosure;
  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;
*** 124,138 ****
  
      private Iterator<HeapRegion> heapRegionIterator() {
          return hrm().heapRegionIterator();
      }
  
!     public void heapRegionIterate(SpaceClosure scl) {
          Iterator<HeapRegion> iter = heapRegionIterator();
          while (iter.hasNext()) {
              HeapRegion hr = iter.next();
!             scl.doSpace(hr);
          }
      }
  
      public CollectedHeapName kind() {
          return CollectedHeapName.G1;
--- 124,138 ----
  
      private Iterator<HeapRegion> heapRegionIterator() {
          return hrm().heapRegionIterator();
      }
  
!     public void heapRegionIterate(HeapRegionClosure hrcl) {
          Iterator<HeapRegion> iter = heapRegionIterator();
          while (iter.hasNext()) {
              HeapRegion hr = iter.next();
!             hrcl.doHeapRegion(hr);
          }
      }
  
      public CollectedHeapName kind() {
          return CollectedHeapName.G1;