review

LizBing · May 4, 2024 · 80eeb44 · 80eeb44
1 parent 4d175e2
commit 80eeb44
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/G1CollectedHeap.java
@@ -110,20 +110,20 @@ public HeapRegionSetBase humongousSet() {
         return VMObjectFactory.newObject(HeapRegionSetBase.class, humongousSetAddr);
     }
 
-    private Iterator<G1HeapRegion> heapRegionIterator() {
-        return hrm().heapRegionIterator();
+    private Iterator<G1HeapRegion> g1HeapRegionIterator() {
+        return hrm().g1HeapRegionIterator();
     }
 
     public void heapRegionIterate(HeapRegionClosure hrcl) {
-        Iterator<G1HeapRegion> iter = heapRegionIterator();
+        Iterator<G1HeapRegion> iter = g1HeapRegionIterator();
         while (iter.hasNext()) {
             G1HeapRegion hr = iter.next();
             hrcl.doHeapRegion(hr);
         }
     }
 
     public G1HeapRegion heapRegionForAddress(Address addr) {
-        Iterator<G1HeapRegion> iter = heapRegionIterator();
+        Iterator<G1HeapRegion> iter = g1HeapRegionIterator();
         while (iter.hasNext()) {
             G1HeapRegion hr = iter.next();
             if (hr.isInRegion(addr)) {
@@ -139,7 +139,7 @@ public CollectedHeapName kind() {
 
     @Override
     public void liveRegionsIterate(LiveRegionsClosure closure) {
-        Iterator<G1HeapRegion> iter = heapRegionIterator();
+        Iterator<G1HeapRegion> iter = g1HeapRegionIterator();
         while (iter.hasNext()) {
             G1HeapRegion hr = iter.next();
             closure.doLiveRegions(hr);

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);
+    public Iterator<G1HeapRegion> g1HeapRegionIterator(long committedLength) {
+        return new G1HeapRegionIterator(committedLength);
     }
 
     public G1HeapRegionTable(Address addr) {

diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionManager.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/g1/HeapRegionManager.java
@@ -70,8 +70,8 @@ public long length() {
         return regions().length();
     }
 
-    public Iterator<G1HeapRegion> heapRegionIterator() {
-        return regions().heapRegionIterator(length());
+    public Iterator<G1HeapRegion> g1HeapRegionIterator() {
+        return regions().g1HeapRegionIterator(length());
     }
 
     public HeapRegionManager(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");
             }

diff --git a/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java b/test/hotspot/jtreg/serviceability/sa/TestG1HeapRegion.java
@@ -59,7 +59,7 @@ private static void checkHeapRegion(String pid) throws Exception {
         try {
             agent.attach(Integer.parseInt(pid));
             G1CollectedHeap heap = (G1CollectedHeap)VM.getVM().getUniverse().heap();
-            G1HeapRegion hr = heap.hrm().heapRegionIterator().next();
+            G1HeapRegion hr = heap.hrm().g1HeapRegionIterator().next();
             G1HeapRegion hrTop = heap.hrm().getByAddress(hr.top());
 
             Asserts.assertEquals(hr.top(), hrTop.top(),