8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails

Reviewed-by: cjplummer, sspitsyn
This commit is contained in:
Aleksey Shipilev 2023-08-21 09:02:01 +00:00
parent 8939d15d92
commit 812f475bc4
2 changed files with 4 additions and 6 deletions

View File

@ -86,10 +86,8 @@ public class HeapSummary extends Tool {
printValMB("MetaspaceSize = ", getFlagValue("MetaspaceSize", flagMap)); printValMB("MetaspaceSize = ", getFlagValue("MetaspaceSize", flagMap));
printValMB("CompressedClassSpaceSize = ", getFlagValue("CompressedClassSpaceSize", flagMap)); printValMB("CompressedClassSpaceSize = ", getFlagValue("CompressedClassSpaceSize", flagMap));
printValMB("MaxMetaspaceSize = ", getFlagValue("MaxMetaspaceSize", flagMap)); printValMB("MaxMetaspaceSize = ", getFlagValue("MaxMetaspaceSize", flagMap));
if (heap instanceof ShenandoahHeap) { if (heap instanceof G1CollectedHeap) {
printValMB("ShenandoahRegionSize = ", ShenandoahHeapRegion.regionSizeBytes()); printValMB("G1HeapRegionSize = ", HeapRegion.grainBytes());
} else {
printValMB("G1HeapRegionSize = ", HeapRegion.grainBytes());
} }
System.out.println(); System.out.println();
@ -138,6 +136,7 @@ public class HeapSummary extends Tool {
long num_regions = sh.numOfRegions(); long num_regions = sh.numOfRegions();
System.out.println("Shenandoah Heap:"); System.out.println("Shenandoah Heap:");
System.out.println(" regions = " + num_regions); System.out.println(" regions = " + num_regions);
printValMB("region size = ", ShenandoahHeapRegion.regionSizeBytes());
printValMB("capacity = ", num_regions * ShenandoahHeapRegion.regionSizeBytes()); printValMB("capacity = ", num_regions * ShenandoahHeapRegion.regionSizeBytes());
printValMB("used = ", sh.used()); printValMB("used = ", sh.used());
printValMB("committed = ", sh.committed()); printValMB("committed = ", sh.committed());

View File

@ -57,8 +57,7 @@ public class JMapHeapConfigTest {
"NewRatio", "NewRatio",
"SurvivorRatio", "SurvivorRatio",
"MetaspaceSize", "MetaspaceSize",
"CompressedClassSpaceSize", "CompressedClassSpaceSize"};
"G1HeapRegionSize"};
// Test can't deal with negative jlongs: // Test can't deal with negative jlongs:
// ignoring MaxMetaspaceSize // ignoring MaxMetaspaceSize