Skip to content

Commit

Permalink
Automatic merge of jdk:master into master
Browse files Browse the repository at this point in the history
  • Loading branch information
duke committed Jun 10, 2021
2 parents 03e33cb + f677163 commit 93280a7
Show file tree
Hide file tree
Showing 21 changed files with 692 additions and 585 deletions.
2 changes: 2 additions & 0 deletions test/hotspot/jtreg/ProblemList.txt
View file
Expand Up @@ -143,6 +143,8 @@ vmTestbase/nsk/jvmti/AttachOnDemand/attach045/TestDescription.java 8202971 gener
vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java 8219652 aix-ppc64
vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/TestDescription.java 8219652 aix-ppc64
vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/TestDescription.java 8219652 aix-ppc64
vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003/TestDescription.java 8264605 generic-all
vmTestbase/nsk/jvmti/PopFrame/popframe011/TestDescription.java 8266593 generic-all

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

Expand Down
84 changes: 49 additions & 35 deletions test/hotspot/jtreg/runtime/Thread/InterruptAtExit.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand All @@ -23,16 +23,16 @@

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

import java.util.concurrent.CountDownLatch;

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

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

public static void main(String[] args) {
InterruptAtExit threads[] = new InterruptAtExit[N_THREADS];
int timeMax = 0;
if (args.length == 0) {
timeMax = DEF_TIME_MAX;
} else {
try {
timeMax = Integer.parseUnsignedInt(args[0]);
} catch (NumberFormatException nfe) {
System.err.println("'" + args[0] + "': invalid timeMax value.");
usage();
}
}

for (int i = 0; i < N_THREADS; i++ ) {
threads[i] = new InterruptAtExit();
int late_count = 1;
threads[i].start();
System.out.println("About to execute for " + timeMax + " seconds.");

long count = 0;
long start_time = System.currentTimeMillis();
while (System.currentTimeMillis() < start_time + (timeMax * 1000)) {
count++;

InterruptAtExit thread = new InterruptAtExit();
thread.start();
try {
// Wait for the worker thread to get going.
threads[i].startSyncObj.await();

// The first interrupt() call will break the
// worker out of the exitSyncObj.await() call
// and the rest will come in during thread exit.
for (; late_count <= N_LATE_CALLS; late_count++) {
threads[i].interrupt();
thread.startSyncObj.await();
// Tell the worker thread to race to the exit and the
// Thread.interrupt() calls will come in during thread exit.
thread.exitSyncObj.countDown();
while (true) {
thread.interrupt();

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

System.out.println("INFO: thread #" + i + ": made " + late_count +
" late calls to java.lang.Thread.interrupt()");
System.out.println("INFO: thread #" + i + ": N_LATE_CALLS==" +
N_LATE_CALLS + " value is " +
((late_count >= N_LATE_CALLS) ? "NOT " : "") +
"large enough to cause a Thread.interrupt() " +
"call after thread exit.");

try {
threads[i].join();
thread.join();
} catch (InterruptedException e) {
throw new Error("Unexpected: " + e);
}
threads[i].interrupt();
if (threads[i].isAlive()) {
throw new Error("Expected !Thread.isAlive() after thread #" +
i + " has been join()'ed");
}
thread.interrupt();
}

System.out.println("Executed " + count + " loops in " + timeMax +
" seconds.");

String cmd = System.getProperty("sun.java.command");
if (cmd != null && !cmd.startsWith("com.sun.javatest.regtest.agent.MainWrapper")) {
// Exit with success in a non-JavaTest environment:
System.exit(0);
}
}

public static void usage() {
System.err.println("Usage: " + PROG_NAME + " [time_max]");
System.err.println("where:");
System.err.println(" time_max max looping time in seconds");
System.err.println(" (default is " + DEF_TIME_MAX +
" seconds)");
System.exit(1);
}
}
85 changes: 49 additions & 36 deletions test/hotspot/jtreg/runtime/Thread/IsInterruptedAtExit.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, 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
Expand All @@ -23,16 +23,16 @@

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

import java.util.concurrent.CountDownLatch;

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

public CountDownLatch exitSyncObj = new CountDownLatch(1);
public CountDownLatch startSyncObj = new CountDownLatch(1);
Expand All @@ -42,33 +42,46 @@ public void run() {
// Tell main thread we have started.
startSyncObj.countDown();
try {
// Wait for main thread to interrupt us so we
// can race to exit.
// Wait for main thread to tell us to race to the exit.
exitSyncObj.await();
} catch (InterruptedException e) {
// ignore because we expect one
throw new RuntimeException("Unexpected: " + e);
}
}

public static void main(String[] args) {
IsInterruptedAtExit threads[] = new IsInterruptedAtExit[N_THREADS];
int timeMax = 0;
if (args.length == 0) {
timeMax = DEF_TIME_MAX;
} else {
try {
timeMax = Integer.parseUnsignedInt(args[0]);
} catch (NumberFormatException nfe) {
System.err.println("'" + args[0] + "': invalid timeMax value.");
usage();
}
}

for (int i = 0; i < N_THREADS; i++ ) {
threads[i] = new IsInterruptedAtExit();
int late_count = 1;
threads[i].start();
System.out.println("About to execute for " + timeMax + " seconds.");

long count = 0;
long start_time = System.currentTimeMillis();
while (System.currentTimeMillis() < start_time + (timeMax * 1000)) {
count++;

IsInterruptedAtExit thread = new IsInterruptedAtExit();
thread.start();
try {
// Wait for the worker thread to get going.
threads[i].startSyncObj.await();

// This interrupt() call will break the worker out of
// the exitSyncObj.await() call and the isInterrupted()
// calls will come in during thread exit.
threads[i].interrupt();
for (; late_count <= N_LATE_CALLS; late_count++) {
threads[i].isInterrupted();
thread.startSyncObj.await();
// Tell the worker thread to race to the exit and the
// Thread.isInterrupted() calls will come in during
// thread exit.
thread.exitSyncObj.countDown();
while (true) {
thread.isInterrupted();

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

System.out.println("INFO: thread #" + i + ": made " + late_count +
" late calls to java.lang.Thread.isInterrupted()");
System.out.println("INFO: thread #" + i + ": N_LATE_CALLS==" +
N_LATE_CALLS + " value is " +
((late_count >= N_LATE_CALLS) ? "NOT " : "") +
"large enough to cause a Thread.isInterrupted() " +
"call after thread exit.");

try {
threads[i].join();
thread.join();
} catch (InterruptedException e) {
throw new Error("Unexpected: " + e);
}
threads[i].isInterrupted();
if (threads[i].isAlive()) {
throw new Error("Expected !Thread.isAlive() after thread #" +
i + " has been join()'ed");
}
thread.isInterrupted();
}

System.out.println("Executed " + count + " loops in " + timeMax +
" seconds.");

String cmd = System.getProperty("sun.java.command");
if (cmd != null && !cmd.startsWith("com.sun.javatest.regtest.agent.MainWrapper")) {
// Exit with success in a non-JavaTest environment:
System.exit(0);
}
}

public static void usage() {
System.err.println("Usage: " + PROG_NAME + " [time_max]");
System.err.println("where:");
System.err.println(" time_max max looping time in seconds");
System.err.println(" (default is " + DEF_TIME_MAX +
" seconds)");
System.exit(1);
}
}
107 changes: 0 additions & 107 deletions test/hotspot/jtreg/runtime/Thread/ResumeAtExit.java
View file

This file was deleted.

0 comments on commit 93280a7

Please sign in to comment.