archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8306028: separate ThreadStart/ThreadEnd events posting code in JVMTI VTMS transitions

Browse source 
8304444: Reappearance of NULL in jvmtiThreadState.cpp

Reviewed-by: pchilanomate, lmesnik
This commit is contained in:
Serguei Spitsyn 2023-05-02 02:40:50 +00:00
parent 35e75c131d
commit 1227a275a1
16 changed files with 265 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/java.base/share/classes/java/lang/VirtualThread.java
View file

@ -205,22 +205,19 @@ final class VirtualThread extends BaseVirtualThread {
}
// set state to RUNNING
boolean firstRun;
int initialState = state();
if (initialState == STARTED && compareAndSetState(STARTED, RUNNING)) {
// first run
firstRun = true;
} else if (initialState == RUNNABLE && compareAndSetState(RUNNABLE, RUNNING)) {
// consume parking permit
setParkPermit(false);
firstRun = false;
} else {
// not runnable
return;
}
// notify JVMTI before mount
notifyJvmtiMount(/*hide*/true, firstRun);
notifyJvmtiMount(/*hide*/true);
try {
cont.run();
@ -300,7 +297,7 @@ final class VirtualThread extends BaseVirtualThread {
// first mount
mount();
notifyJvmtiMount(/*hide*/false, /*first*/true);
notifyJvmtiStart();
// emit JFR event if enabled
if (VirtualThreadStartEvent.isTurnedOn()) {
@ -328,7 +325,7 @@ final class VirtualThread extends BaseVirtualThread {
} finally {
// last unmount
notifyJvmtiUnmount(/*hide*/true, /*last*/true);
notifyJvmtiEnd();
unmount();
// final state
@ -438,14 +435,14 @@ final class VirtualThread extends BaseVirtualThread {
@ChangesCurrentThread
private boolean yieldContinuation() {
// unmount
notifyJvmtiUnmount(/*hide*/true, /*last*/false);
notifyJvmtiUnmount(/*hide*/true);
unmount();
try {
return Continuation.yield(VTHREAD_SCOPE);
} finally {
// re-mount
mount();
notifyJvmtiMount(/*hide*/false, /*first*/false);
notifyJvmtiMount(/*hide*/false);
}
}
@ -462,7 +459,7 @@ final class VirtualThread extends BaseVirtualThread {
setState(PARKED);
// notify JVMTI that unmount has completed, thread is parked
notifyJvmtiUnmount(/*hide*/false, /*last*/false);
notifyJvmtiUnmount(/*hide*/false);
// may have been unparked while parking
if (parkPermit && compareAndSetState(PARKED, RUNNABLE)) {
@ -478,7 +475,7 @@ final class VirtualThread extends BaseVirtualThread {
setState(RUNNABLE);
// notify JVMTI that unmount has completed, thread is runnable
notifyJvmtiUnmount(/*hide*/false, /*last*/false);
notifyJvmtiUnmount(/*hide*/false);
// external submit if there are no tasks in the local task queue
if (currentThread() instanceof CarrierThread ct && ct.getQueuedTaskCount() == 0) {
@ -508,7 +505,7 @@ final class VirtualThread extends BaseVirtualThread {
assert (state() == TERMINATED) && (carrierThread == null);
if (executed) {
notifyJvmtiUnmount(/*hide*/false, /*last*/true);
notifyJvmtiUnmount(/*hide*/false);
}
// notify anyone waiting for this virtual thread to terminate
@ -1086,11 +1083,19 @@ final class VirtualThread extends BaseVirtualThread {
@IntrinsicCandidate
@JvmtiMountTransition
private native void notifyJvmtiMount(boolean hide, boolean firstMount);
private native void notifyJvmtiStart();
@IntrinsicCandidate
@JvmtiMountTransition
private native void notifyJvmtiUnmount(boolean hide, boolean lastUnmount);
private native void notifyJvmtiEnd();
@IntrinsicCandidate
@JvmtiMountTransition
private native void notifyJvmtiMount(boolean hide);
@IntrinsicCandidate
@JvmtiMountTransition
private native void notifyJvmtiUnmount(boolean hide);
@IntrinsicCandidate
@JvmtiMountTransition