Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
8283467: runtime/Thread/StopAtExit.java needs updating
Reviewed-by: dholmes, pchilanomate
  • Loading branch information
Daniel D. Daugherty committed Mar 24, 2022
1 parent b36cf35 commit a7e9883
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 12 deletions.
50 changes: 38 additions & 12 deletions test/hotspot/jtreg/runtime/Thread/StopAtExit.java
Expand Up @@ -23,10 +23,11 @@

/**
* @test
* @bug 8167108 8266130 8282704
* @summary Stress test java.lang.Thread.stop() at thread exit.
* @bug 8167108 8266130 8282704 8283467
* @summary Stress test JVM/TI StopThread() at thread exit.
* @requires vm.jvmti
* @modules java.base/java.lang:open
* @run main/othervm StopAtExit
* @run main/othervm/native -agentlib:StopAtExit StopAtExit
*/

import java.lang.reflect.Method;
Expand All @@ -36,10 +37,13 @@
public class StopAtExit extends Thread {
private final static int DEF_TIME_MAX = 30; // default max # secs to test
private final static String PROG_NAME = "StopAtExit";
private final static int JVMTI_ERROR_THREAD_NOT_ALIVE = 15;

public CountDownLatch exitSyncObj = new CountDownLatch(1);
public CountDownLatch startSyncObj = new CountDownLatch(1);

native static int stopThread(StopAtExit thr, Throwable exception);

public StopAtExit(ThreadGroup group, Runnable target) {
super(group, target);
}
Expand All @@ -56,9 +60,9 @@ public void run() {
throw new RuntimeException("Unexpected: " + e);
}
} catch (ThreadDeath td) {
// ignore because we're testing Thread.stop() which throws it
// ignore because we're testing JVM/TI StopThread() which throws it
} catch (NoClassDefFoundError ncdfe) {
// ignore because we're testing Thread.stop() which can cause it
// ignore because we're testing JVM/TI StopThread() which can cause it
}
}

Expand Down Expand Up @@ -89,27 +93,40 @@ public static void main(String[] args) {
// the thread is terminated.
ThreadGroup myTG = new ThreadGroup("myTG-" + count);
myTG.setDaemon(true);
Throwable myException = new ThreadDeath();
int retCode;
StopAtExit thread = new StopAtExit(myTG, null);
thread.start();
try {
// Wait for the worker thread to get going.
thread.startSyncObj.await();
// Tell the worker thread to race to the exit and the
// Thread.stop() calls will come in during thread exit.
// JVM/TI StopThread() calls will come in during thread exit.
thread.exitSyncObj.countDown();
while (true) {
thread.stop();
retCode = stopThread(thread, myException);

if (retCode == JVMTI_ERROR_THREAD_NOT_ALIVE) {
// Done with JVM/TI StopThread() calls since
// thread is not alive.
break;
} else if (retCode != 0) {
throw new RuntimeException("thread " + thread.getName()
+ ": stopThread() " +
"retCode=" + retCode +
": unexpected value.");
}

if (!thread.isAlive()) {
// Done with Thread.stop() calls since
// Done with JVM/TI StopThread() calls since
// thread is not alive.
break;
}
}
} catch (InterruptedException e) {
throw new Error("Unexpected: " + e);
} catch (NoClassDefFoundError ncdfe) {
// Ignore because we're testing Thread.stop() which can
// Ignore because we're testing JVM/TI StopThread() which can
// cause it. Yes, a NoClassDefFoundError that happens
// in a worker thread can subsequently be seen in the
// main thread.
Expand All @@ -120,9 +137,18 @@ public static void main(String[] args) {
} catch (InterruptedException e) {
throw new Error("Unexpected: " + e);
}
// This stop() call happens after the join() so it should do
// nothing, but let's make sure.
thread.stop();
// This JVM/TI StopThread() happens after the join() so it
// should do nothing, but let's make sure.
retCode = stopThread(thread, myException);

if (retCode != JVMTI_ERROR_THREAD_NOT_ALIVE) {
throw new RuntimeException("thread " + thread.getName()
+ ": stopThread() " +
"retCode=" + retCode +
": unexpected value; " +
"expected JVMTI_ERROR_THREAD_NOT_ALIVE(" +
JVMTI_ERROR_THREAD_NOT_ALIVE + ").");
}

if (myTG.activeCount() != 0) {
// If the ThreadGroup still has a count, then the thread
Expand Down
68 changes: 68 additions & 0 deletions test/hotspot/jtreg/runtime/Thread/libStopAtExit.cpp
@@ -0,0 +1,68 @@
/*
* Copyright (c) 2022, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

#include <string.h>
#include "jvmti.h"

extern "C" {

static jvmtiEnv* jvmti = NULL;

#define LOG(...) \
do { \
printf(__VA_ARGS__); \
printf("\n"); \
fflush(stdout); \
} while (0)

JNIEXPORT jint JNICALL
Java_StopAtExit_stopThread(JNIEnv *jni, jclass cls, jthread thr, jobject exception) {
return jvmti->StopThread(thr, exception);
}


/** Agent library initialization. */

JNIEXPORT jint JNICALL
Agent_OnLoad(JavaVM *jvm, char *options, void *reserved) {
LOG("\nAgent_OnLoad started");

// create JVMTI environment
if (jvm->GetEnv((void **) (&jvmti), JVMTI_VERSION) != JNI_OK) {
return JNI_ERR;
}

// add specific capabilities for stoping thread
jvmtiCapabilities stopCaps;
memset(&stopCaps, 0, sizeof(stopCaps));
stopCaps.can_signal_thread = 1;

jvmtiError err = jvmti->AddCapabilities(&stopCaps);
if (err != JVMTI_ERROR_NONE) {
return JNI_ERR;
}
LOG("Agent_OnLoad finished\n");
return JNI_OK;
}

}

1 comment on commit a7e9883

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.