restore

LizBing · May 18, 2024 · c240897 · c240897
1 parent fa3d82b
commit c240897
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp b/src/hotspot/share/gc/g1/g1CollectionSetCandidates.cpp
@@ -200,7 +200,7 @@ void G1CollectionSetCandidates::clear() {
 void G1CollectionSetCandidates::sort_marking_by_efficiency() {
   G1CollectionCandidateListIterator iter = _marking_regions.begin();
   for (; iter != _marking_regions.end(); ++iter) {
-    HeapRegion* hr = (*iter)->_r;
+    G1HeapRegion* hr = (*iter)->_r;
     (*iter)->_gc_efficiency = hr->calc_gc_efficiency();
   }
   _marking_regions.sort_by_efficiency();

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1HeapRegionTable.java
@@ -90,7 +90,7 @@ public long shiftBy() {
         return shiftByField.getValue(addr);
     }
 
-    private class HeapRegionIterator implements Iterator<G1HeapRegion> {
+    private class G1HeapRegionIterator implements Iterator<G1HeapRegion> {
         private long index;
         private long length;
         private G1HeapRegion next;
@@ -118,15 +118,15 @@ public G1HeapRegion positionToNext() {
         @Override
         public void remove()     { /* not supported */      }
 
-        HeapRegionIterator(long totalLength) {
+        G1HeapRegionIterator(long totalLength) {
             index = 0;
             length = totalLength;
             positionToNext();
         }
     }
 
     public Iterator<G1HeapRegion> heapRegionIterator(long committedLength) {
-        return new HeapRegionIterator(committedLength);
+        return new G1HeapRegionIterator(committedLength);
     }
 
     public G1HeapRegionTable(Address addr) {

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java
@@ -128,7 +128,7 @@ public Generation getGeneration() {
     return gen; // SerialHeap generation
   }
 
-  public G1HeapRegion getHeapRegion() {
+  public G1HeapRegion getG1HeapRegion() {
     return hr; // G1 heap region
   }
 
@@ -302,11 +302,11 @@ public void printOn(PrintStream tty, boolean printAddress, boolean verbose) {
               getGeneration().printOn(tty); // does not include "\n"
           }
           tty.println();
-        } else if (getHeapRegion() != null) {
+        } else if (getG1HeapRegion() != null) {
             // Address is in the G1 heap
             if (verbose) {
                 tty.print("In G1 heap ");
-                getHeapRegion().printOn(tty); // includes "\n"
+                getG1HeapRegion().printOn(tty); // includes "\n"
             } else {
                 tty.println("In G1 heap region");
             }