< prev index next >

test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData.java

8217332: JTREG: Clean up, use generics instead of raw types

*** 64,74 **** protected TestShrinkAuxiliaryData(int hotCardTableSize) { this.hotCardTableSize = hotCardTableSize; } protected void test() throws Exception { ! ArrayList<String> vmOpts = new ArrayList(); Collections.addAll(vmOpts, initialOpts); int maxCacheSize = Math.max(0, Math.min(31, getMaxCacheSize())); if (maxCacheSize < hotCardTableSize) { throw new SkippedException(String.format( --- 64,74 ---- protected TestShrinkAuxiliaryData(int hotCardTableSize) { this.hotCardTableSize = hotCardTableSize; } protected void test() throws Exception { ! ArrayList<String> vmOpts = new ArrayList<>(); Collections.addAll(vmOpts, initialOpts); int maxCacheSize = Math.max(0, Math.min(31, getMaxCacheSize())); if (maxCacheSize < hotCardTableSize) { throw new SkippedException(String.format( ***************
*** 80,97 **** vmOpts.add("-XX:G1ConcRSLogCacheSize=" + hotCardTableSize); // for 32 bits ObjectAlignmentInBytes is not a option if (Platform.is32bit()) { ! ArrayList<String> vmOptsWithoutAlign = new ArrayList(vmOpts); vmOptsWithoutAlign.add(ShrinkAuxiliaryDataTest.class.getName()); performTest(vmOptsWithoutAlign); return; } for (int alignment = 3; alignment <= 8; alignment++) { ! ArrayList<String> vmOptsWithAlign = new ArrayList(vmOpts); vmOptsWithAlign.add("-XX:ObjectAlignmentInBytes=" + (int) Math.pow(2, alignment)); vmOptsWithAlign.add(ShrinkAuxiliaryDataTest.class.getName()); performTest(vmOptsWithAlign); --- 80,97 ---- vmOpts.add("-XX:G1ConcRSLogCacheSize=" + hotCardTableSize); // for 32 bits ObjectAlignmentInBytes is not a option if (Platform.is32bit()) { ! ArrayList<String> vmOptsWithoutAlign = new ArrayList<>(vmOpts); vmOptsWithoutAlign.add(ShrinkAuxiliaryDataTest.class.getName()); performTest(vmOptsWithoutAlign); return; } for (int alignment = 3; alignment <= 8; alignment++) { ! ArrayList<String> vmOptsWithAlign = new ArrayList<>(vmOpts); vmOptsWithAlign.add("-XX:ObjectAlignmentInBytes=" + (int) Math.pow(2, alignment)); vmOptsWithAlign.add(ShrinkAuxiliaryDataTest.class.getName()); performTest(vmOptsWithAlign); ***************
*** 198,209 **** return true; } class GarbageObject { ! private final List<byte[]> payload = new ArrayList(); ! private final List<GarbageObject> ref = new LinkedList(); public GarbageObject(int size) { payload.add(new byte[size]); } --- 198,209 ---- return true; } class GarbageObject { ! private final List<byte[]> payload = new ArrayList<>(); ! private final List<GarbageObject> ref = new LinkedList<>(); public GarbageObject(int size) { payload.add(new byte[size]); } ***************
*** 216,226 **** payload.get(0)[0] = (byte) (Math.random() * Byte.MAX_VALUE); } } } ! private final List<GarbageObject> garbage = new ArrayList(); public void test() throws IOException { MemoryUsage muFull, muFree, muAuxDataFull, muAuxDataFree; float auxFull, auxFree; --- 216,226 ---- payload.get(0)[0] = (byte) (Math.random() * Byte.MAX_VALUE); } } } ! private final List<GarbageObject> garbage = new ArrayList<>(); public void test() throws IOException { MemoryUsage muFull, muFree, muAuxDataFull, muAuxDataFree; float auxFull, auxFree;
< prev index next >