Skip to content
This repository was archived by the owner on Sep 2, 2022. It is now read-only.
/ jdk17 Public archive

Commit 59de99d

Browse files
committed
8267271: Fix gc/arguments/TestNewRatioFlag.java expectedNewSize calculation
Reviewed-by: tschatzl, kbarrett
1 parent 4d545a1 commit 59de99d

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

test/hotspot/jtreg/gc/arguments/TestNewRatioFlag.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,12 @@ public static void main(String args[]) {
122122
public static void verifyDefNewNewRatio(int expectedRatio) {
123123
long initEden = HeapRegionUsageTool.getEdenUsage().getInit();
124124
long initSurv = HeapRegionUsageTool.getSurvivorUsage().getInit();
125-
long initOld = HeapRegionUsageTool.getOldUsage().getInit();
125+
long initHeap = HeapRegionUsageTool.getHeapUsage().getInit();
126126

127127
long newSize = initEden + 2 * initSurv;
128128

129-
long expectedNewSize = HeapRegionUsageTool.alignDown(initOld / expectedRatio,
129+
// See GenArguments::scale_by_NewRatio_aligned for calculation in the JVM.
130+
long expectedNewSize = HeapRegionUsageTool.alignDown(initHeap / (expectedRatio + 1),
130131
wb.getHeapSpaceAlignment());
131132

132133
if (expectedNewSize != newSize) {
@@ -143,11 +144,12 @@ public static void verifyDefNewNewRatio(int expectedRatio) {
143144
public static void verifyPSNewRatio(int expectedRatio) {
144145
long initEden = HeapRegionUsageTool.getEdenUsage().getInit();
145146
long initSurv = HeapRegionUsageTool.getSurvivorUsage().getInit();
146-
long initOld = HeapRegionUsageTool.getOldUsage().getInit();
147+
long initHeap = HeapRegionUsageTool.getHeapUsage().getInit();
147148

148149
long newSize = initEden + 2 * initSurv;
149150

150-
long alignedDownNewSize = HeapRegionUsageTool.alignDown(initOld / expectedRatio,
151+
// See GenArguments::scale_by_NewRatio_aligned for calculation in the JVM.
152+
long alignedDownNewSize = HeapRegionUsageTool.alignDown(initHeap / (expectedRatio + 1),
151153
wb.getHeapSpaceAlignment());
152154
long expectedNewSize = HeapRegionUsageTool.alignUp(alignedDownNewSize,
153155
wb.psVirtualSpaceAlignment());

0 commit comments

Comments
 (0)