Skip to content

Commit

Permalink
8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.ja…
Browse files Browse the repository at this point in the history
…va fails

Backport-of: 812f475bc4ea84225e8bbb0b5a677eed0af864dd
  • Loading branch information
shipilev committed Aug 23, 2023
1 parent d35a896 commit 49ffbcf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,8 @@ public void run() {
printValMB("MetaspaceSize = ", getFlagValue("MetaspaceSize", flagMap));
printValMB("CompressedClassSpaceSize = ", getFlagValue("CompressedClassSpaceSize", flagMap));
printValMB("MaxMetaspaceSize = ", getFlagValue("MaxMetaspaceSize", flagMap));
if (heap instanceof ShenandoahHeap) {
printValMB("ShenandoahRegionSize = ", ShenandoahHeapRegion.regionSizeBytes());
} else {
printValMB("G1HeapRegionSize = ", HeapRegion.grainBytes());
if (heap instanceof G1CollectedHeap) {
printValMB("G1HeapRegionSize = ", HeapRegion.grainBytes());
}

System.out.println();
Expand Down Expand Up @@ -137,6 +135,7 @@ public void run() {
long num_regions = sh.numOfRegions();
System.out.println("Shenandoah Heap:");
System.out.println(" regions = " + num_regions);
printValMB("region size = ", ShenandoahHeapRegion.regionSizeBytes());
printValMB("capacity = ", num_regions * ShenandoahHeapRegion.regionSizeBytes());
printValMB("used = ", sh.used());
printValMB("committed = ", sh.committed());
Expand Down
3 changes: 1 addition & 2 deletions test/jdk/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ public class JMapHeapConfigTest {
"NewRatio",
"SurvivorRatio",
"MetaspaceSize",
"CompressedClassSpaceSize",
"G1HeapRegionSize"};
"CompressedClassSpaceSize"};

// Test can't deal with negative jlongs:
// ignoring MaxMetaspaceSize
Expand Down

1 comment on commit 49ffbcf

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.