Skip to content

Commit f677163

Browse files
author
Daniel D. Daugherty
committedJun 10, 2021
8266130: convert Thread-SMR stress tests from counter based to time based
Reviewed-by: cjplummer, dholmes
·
jdk-21+2121-genzgc+1-8
1 parent 6c552a7 commit f677163

File tree

21 files changed

+692
-585
lines changed

21 files changed

+692
-585
lines changed
 

‎test/hotspot/jtreg/ProblemList.txt

+2
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8202971 gener
143143
vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java 8219652 aix-ppc64
144144
vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/TestDescription.java 8219652 aix-ppc64
145145
vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/TestDescription.java 8219652 aix-ppc64
146+
vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003/TestDescription.java 8264605 generic-all
147+
vmTestbase/nsk/jvmti/PopFrame/popframe011/TestDescription.java 8266593 generic-all
146148

147149
vmTestbase/gc/lock/jni/jnilock002/TestDescription.java 8192647 generic-all
148150

‎test/hotspot/jtreg/runtime/Thread/InterruptAtExit.java

+49-35
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -23,16 +23,16 @@
2323

2424
/**
2525
* @test
26-
* @bug 8167108
26+
* @bug 8167108 8266130
2727
* @summary Stress test java.lang.Thread.interrupt() at thread exit.
28-
* @run main/othervm -Xlog:thread+smr=debug InterruptAtExit
28+
* @run main/othervm InterruptAtExit
2929
*/
3030

3131
import java.util.concurrent.CountDownLatch;
3232

3333
public class InterruptAtExit extends Thread {
34-
final static int N_THREADS = 32;
35-
final static int N_LATE_CALLS = 1000;
34+
private final static int DEF_TIME_MAX = 30; // default max # secs to test
35+
private final static String PROG_NAME = "InterruptAtExit";
3636

3737
public CountDownLatch exitSyncObj = new CountDownLatch(1);
3838
public CountDownLatch startSyncObj = new CountDownLatch(1);
@@ -42,32 +42,46 @@ public void run() {
4242
// Tell main thread we have started.
4343
startSyncObj.countDown();
4444
try {
45-
// Wait for main thread to interrupt us so we
46-
// can race to exit.
45+
// Wait for main thread to tell us to race to the exit.
4746
exitSyncObj.await();
4847
} catch (InterruptedException e) {
49-
// ignore because we expect one
48+
// Ignore because we are testing java.lang.Thread.interrupt()
49+
// and one may arrive before we leave the 'try { }' block.
5050
}
5151
}
5252

5353
public static void main(String[] args) {
54-
InterruptAtExit threads[] = new InterruptAtExit[N_THREADS];
54+
int timeMax = 0;
55+
if (args.length == 0) {
56+
timeMax = DEF_TIME_MAX;
57+
} else {
58+
try {
59+
timeMax = Integer.parseUnsignedInt(args[0]);
60+
} catch (NumberFormatException nfe) {
61+
System.err.println("'" + args[0] + "': invalid timeMax value.");
62+
usage();
63+
}
64+
}
5565

56-
for (int i = 0; i < N_THREADS; i++ ) {
57-
threads[i] = new InterruptAtExit();
58-
int late_count = 1;
59-
threads[i].start();
66+
System.out.println("About to execute for " + timeMax + " seconds.");
67+
68+
long count = 0;
69+
long start_time = System.currentTimeMillis();
70+
while (System.currentTimeMillis() < start_time + (timeMax * 1000)) {
71+
count++;
72+
73+
InterruptAtExit thread = new InterruptAtExit();
74+
thread.start();
6075
try {
6176
// Wait for the worker thread to get going.
62-
threads[i].startSyncObj.await();
63-
64-
// The first interrupt() call will break the
65-
// worker out of the exitSyncObj.await() call
66-
// and the rest will come in during thread exit.
67-
for (; late_count <= N_LATE_CALLS; late_count++) {
68-
threads[i].interrupt();
77+
thread.startSyncObj.await();
78+
// Tell the worker thread to race to the exit and the
79+
// Thread.interrupt() calls will come in during thread exit.
80+
thread.exitSyncObj.countDown();
81+
while (true) {
82+
thread.interrupt();
6983

70-
if (!threads[i].isAlive()) {
84+
if (!thread.isAlive()) {
7185
// Done with Thread.interrupt() calls since
7286
// thread is not alive.
7387
break;
@@ -77,30 +91,30 @@ public static void main(String[] args) {
7791
throw new Error("Unexpected: " + e);
7892
}
7993

80-
System.out.println("INFO: thread #" + i + ": made " + late_count +
81-
" late calls to java.lang.Thread.interrupt()");
82-
System.out.println("INFO: thread #" + i + ": N_LATE_CALLS==" +
83-
N_LATE_CALLS + " value is " +
84-
((late_count >= N_LATE_CALLS) ? "NOT " : "") +
85-
"large enough to cause a Thread.interrupt() " +
86-
"call after thread exit.");
87-
8894
try {
89-
threads[i].join();
95+
thread.join();
9096
} catch (InterruptedException e) {
9197
throw new Error("Unexpected: " + e);
9298
}
93-
threads[i].interrupt();
94-
if (threads[i].isAlive()) {
95-
throw new Error("Expected !Thread.isAlive() after thread #" +
96-
i + " has been join()'ed");
97-
}
99+
thread.interrupt();
98100
}
99101

102+
System.out.println("Executed " + count + " loops in " + timeMax +
103+
" seconds.");
104+
100105
String cmd = System.getProperty("sun.java.command");
101106
if (cmd != null && !cmd.startsWith("com.sun.javatest.regtest.agent.MainWrapper")) {
102107
// Exit with success in a non-JavaTest environment:
103108
System.exit(0);
104109
}
105110
}
111+
112+
public static void usage() {
113+
System.err.println("Usage: " + PROG_NAME + " [time_max]");
114+
System.err.println("where:");
115+
System.err.println(" time_max max looping time in seconds");
116+
System.err.println(" (default is " + DEF_TIME_MAX +
117+
" seconds)");
118+
System.exit(1);
119+
}
106120
}

‎test/hotspot/jtreg/runtime/Thread/IsInterruptedAtExit.java

+49-36
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -23,16 +23,16 @@
2323

2424
/**
2525
* @test
26-
* @bug 8167108
26+
* @bug 8167108 8266130
2727
* @summary Stress test java.lang.Thread.isInterrupted() at thread exit.
28-
* @run main/othervm -Xlog:thread+smr=debug IsInterruptedAtExit
28+
* @run main/othervm IsInterruptedAtExit
2929
*/
3030

3131
import java.util.concurrent.CountDownLatch;
3232

3333
public class IsInterruptedAtExit extends Thread {
34-
final static int N_THREADS = 32;
35-
final static int N_LATE_CALLS = 2000;
34+
private final static int DEF_TIME_MAX = 30; // default max # secs to test
35+
private final static String PROG_NAME = "IsInterruptedAtExit";
3636

3737
public CountDownLatch exitSyncObj = new CountDownLatch(1);
3838
public CountDownLatch startSyncObj = new CountDownLatch(1);
@@ -42,33 +42,46 @@ public void run() {
4242
// Tell main thread we have started.
4343
startSyncObj.countDown();
4444
try {
45-
// Wait for main thread to interrupt us so we
46-
// can race to exit.
45+
// Wait for main thread to tell us to race to the exit.
4746
exitSyncObj.await();
4847
} catch (InterruptedException e) {
49-
// ignore because we expect one
48+
throw new RuntimeException("Unexpected: " + e);
5049
}
5150
}
5251

5352
public static void main(String[] args) {
54-
IsInterruptedAtExit threads[] = new IsInterruptedAtExit[N_THREADS];
53+
int timeMax = 0;
54+
if (args.length == 0) {
55+
timeMax = DEF_TIME_MAX;
56+
} else {
57+
try {
58+
timeMax = Integer.parseUnsignedInt(args[0]);
59+
} catch (NumberFormatException nfe) {
60+
System.err.println("'" + args[0] + "': invalid timeMax value.");
61+
usage();
62+
}
63+
}
5564

56-
for (int i = 0; i < N_THREADS; i++ ) {
57-
threads[i] = new IsInterruptedAtExit();
58-
int late_count = 1;
59-
threads[i].start();
65+
System.out.println("About to execute for " + timeMax + " seconds.");
66+
67+
long count = 0;
68+
long start_time = System.currentTimeMillis();
69+
while (System.currentTimeMillis() < start_time + (timeMax * 1000)) {
70+
count++;
71+
72+
IsInterruptedAtExit thread = new IsInterruptedAtExit();
73+
thread.start();
6074
try {
6175
// Wait for the worker thread to get going.
62-
threads[i].startSyncObj.await();
63-
64-
// This interrupt() call will break the worker out of
65-
// the exitSyncObj.await() call and the isInterrupted()
66-
// calls will come in during thread exit.
67-
threads[i].interrupt();
68-
for (; late_count <= N_LATE_CALLS; late_count++) {
69-
threads[i].isInterrupted();
76+
thread.startSyncObj.await();
77+
// Tell the worker thread to race to the exit and the
78+
// Thread.isInterrupted() calls will come in during
79+
// thread exit.
80+
thread.exitSyncObj.countDown();
81+
while (true) {
82+
thread.isInterrupted();
7083

71-
if (!threads[i].isAlive()) {
84+
if (!thread.isAlive()) {
7285
// Done with Thread.isInterrupted() calls since
7386
// thread is not alive.
7487
break;
@@ -78,30 +91,30 @@ public static void main(String[] args) {
7891
throw new Error("Unexpected: " + e);
7992
}
8093

81-
System.out.println("INFO: thread #" + i + ": made " + late_count +
82-
" late calls to java.lang.Thread.isInterrupted()");
83-
System.out.println("INFO: thread #" + i + ": N_LATE_CALLS==" +
84-
N_LATE_CALLS + " value is " +
85-
((late_count >= N_LATE_CALLS) ? "NOT " : "") +
86-
"large enough to cause a Thread.isInterrupted() " +
87-
"call after thread exit.");
88-
8994
try {
90-
threads[i].join();
95+
thread.join();
9196
} catch (InterruptedException e) {
9297
throw new Error("Unexpected: " + e);
9398
}
94-
threads[i].isInterrupted();
95-
if (threads[i].isAlive()) {
96-
throw new Error("Expected !Thread.isAlive() after thread #" +
97-
i + " has been join()'ed");
98-
}
99+
thread.isInterrupted();
99100
}
100101

102+
System.out.println("Executed " + count + " loops in " + timeMax +
103+
" seconds.");
104+
101105
String cmd = System.getProperty("sun.java.command");
102106
if (cmd != null && !cmd.startsWith("com.sun.javatest.regtest.agent.MainWrapper")) {
103107
// Exit with success in a non-JavaTest environment:
104108
System.exit(0);
105109
}
106110
}
111+
112+
public static void usage() {
113+
System.err.println("Usage: " + PROG_NAME + " [time_max]");
114+
System.err.println("where:");
115+
System.err.println(" time_max max looping time in seconds");
116+
System.err.println(" (default is " + DEF_TIME_MAX +
117+
" seconds)");
118+
System.exit(1);
119+
}
107120
}

‎test/hotspot/jtreg/runtime/Thread/ResumeAtExit.java

-107
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.