stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8311639: Replace currentTimeMillis() with nanoTime() in jtreg/gc

Browse Source 
Reviewed-by: stefank, ayang
This commit is contained in:
Leo Korinth 2023-08-21 12:19:36 +00:00
parent 0b3f452d25
commit 17a19dc060
17 changed files with 112 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/hotspot/jtreg/gc/cslocker/TestCSLocker.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,10 +44,8 @@ import static gc.testlibrary.Allocation.blackHole;
public class TestCSLocker extends Thread
{
static int timeout = 5000;
static int timeoutMillis = 5000;
public static void main(String args[]) throws Exception {
long startTime = System.currentTimeMillis();
// start garbage producer thread
GarbageProducer garbageProducer = new GarbageProducer(1000000, 10);
garbageProducer.start();
@ -61,9 +59,7 @@ public class TestCSLocker extends Thread
// code until unlock() is called below.
// check timeout to success deadlocking
while (System.currentTimeMillis() < startTime + timeout) {
sleep(1000);
}
sleep(timeoutMillis);
csLocker.unlock();
garbageProducer.interrupt();

10
test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -54,7 +54,7 @@ class ObjectWithSomeRefs {
}
class TestEagerReclaimHumongousRegionsClearMarkBitsReclaimRegionFast {
public static final long MAX_MILLIS_FOR_RUN = 50 * 1000; // The maximum runtime for the actual test.
public static final long MAX_NANOS_FOR_RUN = 50L * 1_000_000_000L; // The maximum runtime for the actual test.
public static final int M = 1024*1024;
@ -93,11 +93,11 @@ class TestEagerReclaimHumongousRegionsClearMarkBitsReclaimRegionFast {
Object ref_from_stack = large1;
long start_millis = System.currentTimeMillis();
long start_nanos = System.nanoTime();
for (int i = 0; i < 20; i++) {
long current_millis = System.currentTimeMillis();
if ((current_millis - start_millis) > MAX_MILLIS_FOR_RUN) {
long current_nanos = System.nanoTime();
if ((current_nanos - start_nanos) > MAX_NANOS_FOR_RUN) {
System.out.println("Finishing test because maximum runtime exceeded");
break;
}

10
test/hotspot/jtreg/gc/g1/TestPeriodicCollectionJNI.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -57,8 +57,7 @@ public class TestPeriodicCollectionJNI {
}
public static void main(String[] args) throws InterruptedException {
long timeout = 2000;
long startTime = System.currentTimeMillis();
long timeoutMillis = 2000;
// Start thread doing JNI call
BlockInNative blocker = new BlockInNative();
@ -66,10 +65,7 @@ public class TestPeriodicCollectionJNI {
try {
// Wait for periodic GC timeout to trigger
while (System.currentTimeMillis() < startTime + timeout) {
System.out.println("Sleeping to let periodic GC trigger...");
Thread.sleep(200);
}
Thread.sleep(timeoutMillis);
} finally {
unblock();
}

8
test/hotspot/jtreg/gc/g1/humongousObjects/TestNoAllocationsInHRegions.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -178,11 +178,11 @@ public class TestNoAllocationsInHRegions {
}
// test duration
long duration = Integer.parseInt(args[0]) * 1000L;
long durationNanos = Integer.parseInt(args[0]) * 1_000_000_000L;
// part of heap preallocated with humongous objects (in percents)
int percentOfAllocatedHeap = Integer.parseInt(args[1]);
long startTime = System.currentTimeMillis();
long startTimeNanos = System.nanoTime();
long initialFreeRegionsCount = WB.g1NumFreeRegions();
int regionsToAllocate = (int) ((double) initialFreeRegionsCount / 100.0 * percentOfAllocatedHeap);
@ -219,7 +219,7 @@ public class TestNoAllocationsInHRegions {
threads.stream().forEach(Thread::start);
while ((System.currentTimeMillis() - startTime < duration) && error == null) {
while ((System.nanoTime() - startTimeNanos < durationNanos) && error == null) {
Thread.yield();
}

8
test/hotspot/jtreg/gc/logging/TestUnifiedLoggingSwitchStress.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -222,9 +222,9 @@ public class TestUnifiedLoggingSwitchStress {
if (args.length != 1) {
throw new Error("Test Bug: Expected duration (in seconds) wasn't provided as command line argument");
}
long duration = Integer.parseInt(args[0]) * 1000;
long durationNanos = Integer.parseInt(args[0]) * 1_000_000_000L;
long startTime = System.currentTimeMillis();
long startTimeNanos = System.nanoTime();
List<Thread> threads = new LinkedList<>();
@ -238,7 +238,7 @@ public class TestUnifiedLoggingSwitchStress {
threads.stream().forEach(Thread::start);
while (System.currentTimeMillis() - startTime < duration) {
while (System.nanoTime() - startTimeNanos < durationNanos) {
Thread.yield();
}

6
test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java
View File

@ -113,7 +113,7 @@ public class TestStringDedupStress {
private static final int TARGET_STRINGS = Integer.getInteger("targetStrings", 2_500_000);
private static final long MAX_REWRITE_GC_CYCLES = 6;
private static final long MAX_REWRITE_TIME = 30*1000; // ms
private static final long MAX_REWRITE_TIME_NS = 30L * 1_000_000_000L; // 30s in ns
private static final int UNIQUE_STRINGS = 20;
@ -211,7 +211,7 @@ public class TestStringDedupStress {
}
long cycleBeforeRewrite = gcCycleMBean.getCollectionCount();
long timeBeforeRewrite = System.currentTimeMillis();
long timeBeforeRewriteNanos = System.nanoTime();
long loop = 1;
while (true) {
@ -229,7 +229,7 @@ public class TestStringDedupStress {
}
// enough time is spent waiting for GC to happen
if (System.currentTimeMillis() - timeBeforeRewrite >= MAX_REWRITE_TIME) {
if (System.nanoTime() - timeBeforeRewriteNanos >= MAX_REWRITE_TIME_NS) {
break;
}
}

10
test/hotspot/jtreg/gc/shenandoah/jni/TestJNIGlobalRefs.java
View File

@ -49,7 +49,7 @@ public class TestJNIGlobalRefs {
System.loadLibrary("TestJNIGlobalRefs");
}
private static final int TIME_MSEC = 120000;
private static final long TIME_NSEC = 120L * 1_000_000_000L;
private static final int ARRAY_SIZE = 10000;
private static native void makeGlobalRef(Object o);
@ -60,13 +60,13 @@ public class TestJNIGlobalRefs {
public static void main(String[] args) throws Throwable {
seedGlobalRef();
seedWeakGlobalRef();
long start = System.currentTimeMillis();
long current = start;
while (current - start < TIME_MSEC) {
long startNanos = System.nanoTime();
long currentNanos = startNanos;
while (currentNanos - startNanos < TIME_NSEC) {
testGlobal();
testWeakGlobal();
Thread.sleep(1);
current = System.currentTimeMillis();
currentNanos = System.nanoTime();
}
}

6
test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java
View File

@ -129,7 +129,7 @@ public class TestChurnNotifications {
static volatile Object sink;
public static void main(String[] args) throws Exception {
final long startTime = System.currentTimeMillis();
final long startTimeNanos = System.nanoTime();
final AtomicLong churnBytes = new AtomicLong();
@ -176,8 +176,8 @@ public class TestChurnNotifications {
// Look at test timeout to figure out how long we can wait without breaking into timeout.
// Default to 1/4 of the remaining time in 1s steps.
final long STEP_MS = 1000;
long spentTime = System.currentTimeMillis() - startTime;
long maxTries = (Utils.adjustTimeout(Utils.DEFAULT_TEST_TIMEOUT) - spentTime) / STEP_MS / 4;
long spentTimeNanos = System.nanoTime() - startTimeNanos;
long maxTries = (Utils.adjustTimeout(Utils.DEFAULT_TEST_TIMEOUT) - (spentTimeNanos / 1_000_000L)) / STEP_MS / 4;
// Wait until enough notifications are accrued to match minimum boundary.
long tries = 0;

6
test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java
View File

@ -122,7 +122,7 @@ public class TestPauseNotifications {
}
public static void main(String[] args) throws Exception {
final long startTime = System.currentTimeMillis();
final long startTimeNanos = System.nanoTime();
final AtomicLong pausesDuration = new AtomicLong();
final AtomicLong cyclesDuration = new AtomicLong();
@ -173,8 +173,8 @@ public class TestPauseNotifications {
// Look at test timeout to figure out how long we can wait without breaking into timeout.
// Default to 1/4 of the remaining time in 1s steps.
final long STEP_MS = 1000;
long spentTime = System.currentTimeMillis() - startTime;
long maxTries = (Utils.adjustTimeout(Utils.DEFAULT_TEST_TIMEOUT) - spentTime) / STEP_MS / 4;
long spentTimeNanos = System.nanoTime() - startTimeNanos;
long maxTries = (Utils.adjustTimeout(Utils.DEFAULT_TEST_TIMEOUT) - (spentTimeNanos / 1_000_000L)) / STEP_MS / 4;
long actualPauses = 0;
long actualCycles = 0;

26
test/hotspot/jtreg/gc/stress/TestJNIBlockFullGC/TestJNIBlockFullGC.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017 SAP SE and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@ -62,12 +62,12 @@ public class TestJNIBlockFullGC {
}
}
public static void warmUp(long warmupEndTime, int size, long seed) {
public static void warmUp(long warmupEndTimeNanos, int size, long seed) {
Random r = new Random(seed);
// First let the GC assume most of our objects will die.
Node[] roots = new Node[size];
while (System.currentTimeMillis() < warmupEndTime) {
while (System.nanoTime() - warmupEndTimeNanos < 0) {
int index = (int) (r.nextDouble() * roots.length);
roots[index] = new Node(1);
}
@ -78,7 +78,7 @@ public class TestJNIBlockFullGC {
}
}
public static void runTest(long endTime, int size, double alive, long seed) {
public static void runTest(long endTimeNanos, int size, double alive, long seed) {
Random r = new Random(seed);
final int length = 10000;
int[] array1 = new int[length];
@ -91,7 +91,7 @@ public class TestJNIBlockFullGC {
int index = 0;
roots[0] = new Node(0);
while (!hadError && (System.currentTimeMillis() < endTime)) {
while (!hadError && (System.nanoTime() - endTimeNanos < 0)) {
int test_val1 = TestCriticalArray0(array1);
if (r.nextDouble() > alive) {
@ -136,15 +136,15 @@ public class TestJNIBlockFullGC {
int warmupThreads = Integer.parseInt(args[0]);
System.out.println("# Warmup Threads = " + warmupThreads);
int warmupDuration = Integer.parseInt(args[1]);
System.out.println("WarmUp Duration = " + warmupDuration);
long warmupDurationNanos = 1_000_000L * Integer.parseInt(args[1]);
System.out.println("WarmUp Duration Millis = " + args[1]);
int warmupIterations = Integer.parseInt(args[2]);
System.out.println("# Warmup Iterations = "+ warmupIterations);
int mainThreads = Integer.parseInt(args[3]);
System.out.println("# Main Threads = " + mainThreads);
int mainDuration = Integer.parseInt(args[4]);
System.out.println("Main Duration = " + mainDuration);
long mainDurationNanos = 1_000_000L * Integer.parseInt(args[4]);
System.out.println("Main Duration Millis = " + args[4]);
int mainIterations = Integer.parseInt(args[5]);
System.out.println("# Main Iterations = " + mainIterations);
@ -154,12 +154,12 @@ public class TestJNIBlockFullGC {
Thread threads[] = new Thread[Math.max(warmupThreads, mainThreads)];
System.out.println("Start warm-up threads!");
long warmupStartTime = System.currentTimeMillis();
long warmupStartTimeNanos = System.nanoTime();
for (int i = 0; i < warmupThreads; i++) {
long seed = rng.nextLong();
threads[i] = new Thread() {
public void run() {
warmUp(warmupStartTime + warmupDuration, warmupIterations, seed);
warmUp(warmupStartTimeNanos + warmupDurationNanos, warmupIterations, seed);
};
};
threads[i].start();
@ -170,12 +170,12 @@ public class TestJNIBlockFullGC {
System.gc();
System.out.println("Keep alive a lot");
long startTime = System.currentTimeMillis();
long startTimeNanos = System.nanoTime();
for (int i = 0; i < mainThreads; i++) {
long seed = rng.nextLong();
threads[i] = new Thread() {
public void run() {
runTest(startTime + mainDuration, mainIterations, liveFrac, seed);
runTest(startTimeNanos + mainDurationNanos, mainIterations, liveFrac, seed);
};
};
threads[i].start();

16
test/hotspot/jtreg/gc/stress/TestMultiThreadStressRSet.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -111,7 +111,7 @@ public class TestMultiThreadStressRSet {
}
long time = Long.parseLong(args[0]);
int threads = Integer.parseInt(args[1]);
new TestMultiThreadStressRSet().test(time * 1000, threads);
new TestMultiThreadStressRSet().test(time * 1_000_000_000L, threads);
}
/**
@ -147,23 +147,23 @@ public class TestMultiThreadStressRSet {
* <li> stops the Shifter thread
* </ul>
*
* @param timeInMillis how long to stress
* @param timeInNanos how long to stress
* @param maxThreads the maximum number of Worker thread working together.
*/
public void test(long timeInMillis, int maxThreads) {
if (timeInMillis <= 0 || maxThreads <= 0) {
public void test(long timeInNanos, int maxThreads) {
if (timeInNanos <= 0 || maxThreads <= 0) {
throw new IllegalArgumentException("TEST BUG: be positive!");
}
System.out.println("%% Time to work: " + timeInMillis / 1000 + "s");
System.out.println("%% Time to work: " + timeInNanos / 1_000_000_000L + "s");
System.out.println("%% Number of threads: " + maxThreads);
long finish = System.currentTimeMillis() + timeInMillis;
long finishNanos = System.nanoTime() + timeInNanos;
Shifter shift = new Shifter(this, 1000, (int) (windowSize * 0.9));
shift.start();
for (int i = 0; i < maxThreads; i++) {
new Worker(this, 100).start();
}
try {
while (System.currentTimeMillis() < finish && errorMessage == null) {
while (System.nanoTime() - finishNanos < 0 && errorMessage == null) {
Thread.sleep(100);
}
} catch (Throwable t) {

18
test/hotspot/jtreg/gc/stress/TestStressRSetCoarsening.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -139,23 +139,23 @@ public class TestStressRSetCoarsening {
/**
* Initial time.
*/
public final long start;
public final long startNanos;
/**
* Time when the test should stop working.
*/
public final long finishAt;
public final long finishAtNanos;
/**
* Does pre-calculation and allocate necessary objects.
*
* @param objPerRegions how many objects per G1 heap region
*/
TestStressRSetCoarsening(int objPerRegions, int regsToRefresh, int timeout) {
TestStressRSetCoarsening(int objPerRegions, int regsToRefresh, int timeoutSec) {
this.K = objPerRegions;
this.regsToRefresh = regsToRefresh;
this.start = System.currentTimeMillis();
this.finishAt = start + timeout * 900; // 10% ahead of jtreg timeout
this.startNanos = System.nanoTime();
this.finishAtNanos = startNanos + (timeoutSec * 900_000_000L); // 10% ahead of jtreg timeout
long regionSize = WB.g1RegionSize();
@ -284,7 +284,7 @@ public class TestStressRSetCoarsening {
for (int rn = pre; rn != cur; rn += step) {
Object[] rnArray = storage.getArrayAt(getY(to, from, rn));
rnArray[getX(to, from, rn)] = celebrity;
if (System.currentTimeMillis() > finishAt) {
if (System.nanoTime() - finishAtNanos > 0) {
throw new TimeoutException();
}
}
@ -322,9 +322,9 @@ public class TestStressRSetCoarsening {
} catch (TimeoutException e) {
System.out.println("%% TIMEOUT!!!");
}
long now = System.currentTimeMillis();
long nowNanos = System.nanoTime();
System.out.println("%% Summary");
System.out.println("%% Time spent : " + ((now - start) / 1000) + " seconds");
System.out.println("%% Time spent : " + ((nowNanos - startNanos) / 1_000_000_000L) + " seconds");
System.out.println("%% Free memory left : " + Runtime.getRuntime().freeMemory() / KB + "K");
System.out.println("%% Test passed");
}

8
test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasher.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -57,9 +57,9 @@ public class TestGCBasher {
return;
}
long durationMillis = Long.valueOf(args[0]);
long start = System.currentTimeMillis();
while (System.currentTimeMillis() - start < durationMillis) {
long durationNanos = Long.valueOf(args[0]) * 1_000_000L;
long startNanos = System.nanoTime();
while (System.nanoTime() - startNanos < durationNanos) {
parseClassFiles();
}
}

18
test/hotspot/jtreg/gc/stress/gclocker/TestExcessGCLockerCollections.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -133,18 +133,12 @@ class TestExcessGCLockerCollectionsAux {
new Thread(new JNICriticalWorker()).start();
}
long durationMS = (long) (1000 * durationSec);
long start = System.currentTimeMillis();
long now = start;
long soFar = now - start;
while (soFar < durationMS) {
try {
Thread.sleep(durationMS - soFar);
} catch (Exception e) {
}
now = System.currentTimeMillis();
soFar = now - start;
try {
Thread.sleep(durationSec * 1000L);
} catch (InterruptedException e) {
throw new RuntimeException("Test Failure, did not expect an InterruptedException", e);
}
println("Done.");
keepRunning = false;
}

55
test/hotspot/jtreg/gc/stress/gclocker/TestGCLocker.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -78,16 +78,16 @@ class MemoryWatcher {
private MemoryPoolMXBean bean;
private final int thresholdPromille = 750;
private final int criticalThresholdPromille = 800;
private final int minGCWaitMS = 1000;
private final int minFreeWaitElapsedMS = 30000;
private final int minFreeCriticalWaitMS;
private final long minGCWaitNanos = 1_000_000_000L;
private final long minFreeWaitElapsedNanos = 30L * 1_000_000_000L;
private final long minFreeCriticalWaitNanos;
private int lastUsage = 0;
private long lastGCDetected = System.currentTimeMillis();
private long lastFree = System.currentTimeMillis();
private long lastGCDetectedNanos = System.nanoTime();
private long lastFreeNanos = System.nanoTime();
public MemoryWatcher(String mxBeanName, int minFreeCriticalWaitMS) {
this.minFreeCriticalWaitMS = minFreeCriticalWaitMS;
public MemoryWatcher(String mxBeanName, long minFreeCriticalWaitNanos) {
this.minFreeCriticalWaitNanos = minFreeCriticalWaitNanos;
List<MemoryPoolMXBean> memoryBeans = ManagementFactory.getMemoryPoolMXBeans();
for (MemoryPoolMXBean bean : memoryBeans) {
if (bean.getName().equals(mxBeanName)) {
@ -111,25 +111,25 @@ class MemoryWatcher {
public synchronized boolean shouldFreeUpSpace() {
int usage = getMemoryUsage();
long now = System.currentTimeMillis();
long nowNanos = System.nanoTime();
boolean detectedGC = false;
if (usage < lastUsage) {
lastGCDetected = now;
lastGCDetectedNanos = nowNanos;
detectedGC = true;
}
lastUsage = usage;
long elapsed = now - lastFree;
long timeSinceLastGC = now - lastGCDetected;
long elapsedNanos = nowNanos - lastFreeNanos;
long timeSinceLastGCNanos = nowNanos - lastGCDetectedNanos;
if (usage > criticalThresholdPromille && elapsed > minFreeCriticalWaitMS) {
lastFree = now;
if (usage > criticalThresholdPromille && elapsedNanos > minFreeCriticalWaitNanos) {
lastFreeNanos = nowNanos;
return true;
} else if (usage > thresholdPromille && !detectedGC) {
if (elapsed > minFreeWaitElapsedMS || timeSinceLastGC > minGCWaitMS) {
lastFree = now;
if (elapsedNanos > minFreeWaitElapsedNanos || timeSinceLastGCNanos > minGCWaitNanos) {
lastFreeNanos = nowNanos;
return true;
}
}
@ -152,8 +152,8 @@ class MemoryUser extends Exitable implements Runnable {
cache.add(new Filler());
}
public MemoryUser(String mxBeanName, int minFreeCriticalWaitMS) {
watcher = new MemoryWatcher(mxBeanName, minFreeCriticalWaitMS);
public MemoryUser(String mxBeanName, long minFreeCriticalWaitNanos) {
watcher = new MemoryWatcher(mxBeanName, minFreeCriticalWaitNanos);
}
@Override
@ -192,8 +192,8 @@ public class TestGCLocker {
return task;
}
private static Exitable startMemoryUser(String mxBeanName, int minFreeCriticalWaitMS) {
MemoryUser task = new MemoryUser(mxBeanName, minFreeCriticalWaitMS);
private static Exitable startMemoryUser(String mxBeanName, long minFreeCriticalWaitNanos) {
MemoryUser task = new MemoryUser(mxBeanName, minFreeCriticalWaitNanos);
Thread thread = new Thread(task);
thread.setName("Memory User");
@ -207,17 +207,18 @@ public class TestGCLocker {
long durationMinutes = args.length > 0 ? Long.parseLong(args[0]) : 5;
String mxBeanName = args.length > 1 ? args[1] : null;
int minFreeCriticalWaitMS = args.length > 2 ? Integer.parseInt(args[2]) : 500;
long startMS = System.currentTimeMillis();
long minFreeCriticalWaitNanos = args.length > 2
? Integer.parseInt(args[2]) * 1_000_000L
: 500_000_000L;
Exitable stresser1 = startGCLockerStresser("GCLockerStresser1");
Exitable stresser2 = startGCLockerStresser("GCLockerStresser2");
Exitable memoryUser = startMemoryUser(mxBeanName, minFreeCriticalWaitMS);
Exitable memoryUser = startMemoryUser(mxBeanName, minFreeCriticalWaitNanos);
long durationMS = durationMinutes * 60 * 1000;
while ((System.currentTimeMillis() - startMS) < durationMS) {
ThreadUtils.sleep(10 * 1010);
try {
Thread.sleep(durationMinutes * 60_000L);
} catch (InterruptedException e) {
throw new RuntimeException("Test Failure, did not except an InterruptedException", e);
}
stresser1.exit();

8
test/hotspot/jtreg/gc/stress/gcold/TestGCOld.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -369,14 +369,14 @@ public class TestGCOld {
System.err.println("Initialization complete...");
long start = System.currentTimeMillis();
long startNanos = System.nanoTime();
for (int step = 0; step < steps; step++) {
doStep(MEG);
}
long end = System.currentTimeMillis();
float secs = ((float)(end-start))/1000.0F;
long endNanos = System.nanoTime();
float secs = (endNanos - startNanos) / 1_000_000_000F;
// checkTrees();

14
test/hotspot/jtreg/gc/stress/systemgc/TestSystemGC.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -104,7 +104,7 @@ class SystemGCTask extends Exitable implements Runnable {
}
public class TestSystemGC {
private static long endTime;
private static long endTimeNanos;
private static final int numGroups = 7;
private static final int numGCsPerGroup = 4;
@ -137,7 +137,7 @@ public class TestSystemGC {
for (int i = 0; i < numGroups; i++) {
for (int j = 0; j < numGCsPerGroup; j++) {
System.gc();
if (System.currentTimeMillis() >= endTime) {
if (System.nanoTime() - endTimeNanos >= 0) {
return;
}
ThreadUtils.sleep(getDelayMS(i));
@ -165,7 +165,7 @@ public class TestSystemGC {
}
private static void runAllPhases() {
for (int i = 0; i < 4 && System.currentTimeMillis() < endTime; i++) {
for (int i = 0; i < 4 && System.nanoTime() - endTimeNanos < 0; i++) {
SystemGCTask gcTask =
(i % 2 == 1) ? createSystemGCTask(numGroups / 3) : null;
ShortLivedAllocationTask shortTask =
@ -191,9 +191,9 @@ public class TestSystemGC {
if (args.length == 0) {
throw new IllegalArgumentException("Must specify timeout in seconds as first argument");
}
int timeout = Integer.parseInt(args[0]) * 1000;
System.out.println("Running with timeout of " + timeout + "ms");
endTime = System.currentTimeMillis() + timeout;
long timeoutNanos = Integer.parseInt(args[0]) * 1_000_000_000L;
System.out.println("Running with timeout of " + args[0] + " seconds");
endTimeNanos = System.nanoTime() + timeoutNanos;
// First allocate the long lived objects and then run all phases.
populateLongLived();
runAllPhases();