Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 38 additions & 6 deletions src/java.base/share/classes/java/lang/Thread.java
Original file line number Diff line number Diff line change
Expand Up @@ -2459,21 +2459,53 @@ public State getState() {
return threadState();
}

/**
* Returns the translation from a J9VMThread state to a Thread::State.
*
* @param status thread status value set by VM.
* @return this thread's state.
*
* @see State
*/
private State translateJ9VMThreadStateToThreadState(int status) {
switch (status) {
case 0x1: // J9VMTHREAD_STATE_RUNNING
return State.RUNNABLE;
case 0x2: // J9VMTHREAD_STATE_BLOCKED
return State.BLOCKED;
case 0x4: // J9VMTHREAD_STATE_WAITING
case 0x80: // J9VMTHREAD_STATE_PARKED
return State.WAITING;
case 0x8: // J9VMTHREAD_STATE_SLEEPING
case 0x40: // J9VMTHREAD_STATE_WAITING_TIMED
case 0x100: // J9VMTHREAD_STATE_PARKED_TIMED
return State.TIMED_WAITING;
case 0x20: // J9VMTHREAD_STATE_DEAD
return State.TERMINATED;
default:
synchronized (interruptLock) {
if (eetop == NO_REF) {
return State.TERMINATED;
}
return State.values()[getStateImpl(eetop)];
}
}
}

/**
* Returns the state of this thread.
* This method can be used instead of getState as getState is not final and
* so can be overridden to run arbitrary code.
*/
State threadState() {
synchronized (interruptLock) {
if (started) {
if (eetop == NO_REF) {
if (isDead()) {
return State.TERMINATED;
}
return State.NEW;
return State.TERMINATED;
}
return State.values()[getStateImpl(eetop)];
return translateJ9VMThreadStateToThreadState(
(holder != null) ? holder.threadStatus : 0);
}
return State.NEW;
}

/**
Expand Down