Add support for JEP491 on JDK24+

- Add missing setThreadState
- Fix thread state on notified blocked threads

Signed-off-by: Jack Lu <Jack.S.Lu@ibm.com>

Author: fengxue-IS

runtime/oti/VMHelpers.hpp

@@ -2278,7 +2278,6 @@ class VM_VMHelpers
 		indicateAsyncMessagePending(targetThread);
 	}
 
-
 	static U_32
 	setThreadState(J9VMThread *currentThread, U_32 state)
 	{
@@ -2289,14 +2288,14 @@ class VM_VMHelpers
 			/* Platform threads must have a non-null FieldHolder object. */
 			j9object_t threadHolder = J9VMJAVALANGTHREAD_HOLDER(currentThread, receiverObject);
 			if (NULL != threadHolder) {
-				oldState = (U_32)J9VMJAVALANGTHREADFIELDHOLDER_THREADSTATUS(currentThread, threadHolder);
+				oldState = J9VMJAVALANGTHREADFIELDHOLDER_THREADSTATUS(currentThread, threadHolder);
 				J9VMJAVALANGTHREADFIELDHOLDER_SET_THREADSTATUS(currentThread, threadHolder, state);
 			}
 		}
 #else /* JAVA_SPEC_VERSION >= 19 */
 		j9object_t receiverObject = currentThread->threadObject;
 		if (NULL != receiverObject) {
-			oldState = (U_32)J9VMJAVALANGTHREAD_THREADSTATUS(currentThread, receiverObject);
+			oldState = J9VMJAVALANGTHREAD_THREADSTATUS(currentThread, receiverObject);
 			J9VMJAVALANGTHREAD_SET_THREADSTATUS(currentThread, receiverObject, state);
 		}
 #endif /* JAVA_SPEC_VERSION >= 19 */

runtime/vm/ObjectMonitor.cpp

@@ -290,6 +290,8 @@ objectMonitorEnterBlocking(J9VMThread *currentThread)
 				J9_STORE_LOCKWORD(currentThread, lwEA, lock);
 				goto done;
 			}
+			/* Set j.l.Thread status to BLOCKED. */
+			VM_VMHelpers::setThreadState(currentThread, J9VMTHREAD_STATE_BLOCKED);
 			internalReleaseVMAccessSetStatus(currentThread, J9_PUBLIC_FLAGS_THREAD_BLOCKED);
 			SET_IGNORE_ENTER(monitor);
 			omrthread_monitor_wait_timed(monitor, (I_64)waitTime, 0);

runtime/vm/threadhelp.cpp

@@ -121,10 +121,12 @@ monitorWaitImpl(J9VMThread *vmThread, j9object_t object, I_64 millis, I_32 nanos
 #if JAVA_SPEC_VERSION >= 24
 		J9VM_SEND_VIRTUAL_UNBLOCKER_THREAD_SIGNAL(javaVM);
 #endif /* JAVA_SPEC_VERSION >= 24 */
-		/* Set j.l.Thread status to WAITING. */
-		U_32 oldState = J9_ARE_ANY_BITS_SET(thrstate, J9_PUBLIC_FLAGS_THREAD_TIMED)
-				? VM_VMHelpers::setThreadState(vmThread, J9VMTHREAD_STATE_WAITING_TIMED)
-				: VM_VMHelpers::setThreadState(vmThread, J9VMTHREAD_STATE_WAITING);
+		/* Set j.l.Thread status to UNKNOWN since the wait can be notified/interrupted
+		 * but blocked on re-acquiring the monitor.
+		 * In this case, the thread state will have to be determined by looking at
+		 * the vmThread->publicFlags field.
+		 */
+		U_32 oldState = VM_VMHelpers::setThreadState(vmThread, J9VMTHREAD_STATE_UNKNOWN);
 		internalReleaseVMAccessSetStatus(vmThread, thrstate);
 		rc = timeCompensationHelper(vmThread,
 			interruptable ? HELPER_TYPE_MONITOR_WAIT_INTERRUPTABLE : HELPER_TYPE_MONITOR_WAIT_TIMED, monitor, millis, nanos);

runtime/vm/threadpark.cpp

@@ -100,8 +100,8 @@ threadParkImpl(J9VMThread *vmThread, BOOLEAN timeoutIsEpochRelative, I_64 timeou
 		TRIGGER_J9HOOK_VM_PARK(vm->hookInterface, vmThread, millis, nanos);
 		/* Set j.l.Thread status to WAITING. */
 		U_32 oldState = J9_ARE_ANY_BITS_SET(thrstate, J9_PUBLIC_FLAGS_THREAD_TIMED)
-				? VM_VMHelpers::setThreadState(vmThread, J9VMTHREAD_STATE_WAITING_TIMED)
-				: VM_VMHelpers::setThreadState(vmThread, J9VMTHREAD_STATE_WAITING);
+				? VM_VMHelpers::setThreadState(vmThread, J9VMTHREAD_STATE_PARKED_TIMED)
+				: VM_VMHelpers::setThreadState(vmThread, J9VMTHREAD_STATE_PARKED);
 		internalReleaseVMAccessSetStatus(vmThread, thrstate);
 
 		while (1) {