Add check for live Vthreads in pinned checks

Signed-off-by: Tobi Ajila <atobia@ca.ibm.com>

Author: tajila

runtime/oti/j9.h

@@ -450,6 +450,14 @@ static_assert((LITERAL_STRLEN(J9_UNMODIFIABLE_CLASS_ANNOTATION) < (size_t)'/'),
 		} while (0)
 #endif /* JAVA_SPEC_VERSION >= 24 */
 
+#if JAVA_SPEC_VERSION >= 24
+#define J9VM_ARE_PINNED_YIELDABLE_VIRTUALTHREADS_ACTIVE(vm) \
+		(J9_ARE_ANY_BITS_SET((vm)->extendedRuntimeFlags3, J9_EXTENDED_RUNTIME3_YIELD_PINNED_CONTINUATION) \
+		&& J9_ARE_ANY_BITS_SET((vm)->extendedRuntimeFlags3, J9_EXTENDED_RUNTIME3_YIELD_PINNED_CONTINUATION))
+#else
+#define J9VM_ARE_PINNED_YIELDABLE_VIRTUALTHREADS_ACTIVE(vm) (1 == 0)
+#endif
+
 #define DIR_LIB_STR "lib"
 
 #if defined(J9VM_OPT_JFR)

runtime/oti/j9consts.h

@@ -391,6 +391,7 @@ extern "C" {
 #define J9_EXTENDED_RUNTIME3_GCCONTAINERHEURISTICS 0x400
 #define J9_EXTENDED_RUNTIME3_USE_VECTOR_LENGTH_256 0x800
 #define J9_EXTENDED_RUNTIME3_USE_VECTOR_LENGTH_512 0x1000
+#define J9_EXTENDED_RUNTIME3_VTHREAD_CREATED 0x2000
 
 
 #define J9_OBJECT_HEADER_AGE_DEFAULT 0xA /* OBJECT_HEADER_AGE_DEFAULT */

runtime/vm/BytecodeInterpreter.hpp

@@ -3044,7 +3044,7 @@ class INTERPRETER_CLASS
 		{
 			if (VM_ObjectMonitor::getMonitorForNotify(_currentThread, receiver, &monitorPtr, true)) {
 #if JAVA_SPEC_VERSION >= 24
-				if (J9_ARE_ANY_BITS_SET(_vm->extendedRuntimeFlags3, J9_EXTENDED_RUNTIME3_YIELD_PINNED_CONTINUATION)) {
+				if (J9VM_ARE_PINNED_YIELDABLE_VIRTUALTHREADS_ACTIVE(_vm)) {
 					j9objectmonitor_t lock = 0;
 					j9objectmonitor_t *lockEA = NULL;
 					J9ObjectMonitor *objectMonitor = NULL;

runtime/vm/ContinuationHelpers.cpp

@@ -45,6 +45,8 @@ createContinuation(J9VMThread *currentThread, j9object_t continuationObject)
 	I_64 start = j9time_hires_clock();
 #endif /* defined(J9VM_PROF_CONTINUATION_ALLOCATION) */
 
+	vm->extendedRuntimeFlags3 |= J9_EXTENDED_RUNTIME3_VTHREAD_CREATED;
+
 	/* First check if local cache is available. */
 	if (NULL != currentThread->continuationT1Cache) {
 		for (U_32 i = 0; i < vm->continuationT1Size; i++) {

runtime/vm/FastJNI_java_lang_Object.cpp

@@ -62,7 +62,7 @@ Fast_java_lang_Object_notifyAll(J9VMThread *currentThread, j9object_t receiverOb
 		if (VM_ObjectMonitor::getMonitorForNotify(currentThread, receiverObject, &monitorPtr, true)) {
 #if JAVA_SPEC_VERSION >= 24
 			J9JavaVM *vm = currentThread->javaVM;
-			if (J9_ARE_ANY_BITS_SET(vm->extendedRuntimeFlags3, J9_EXTENDED_RUNTIME3_YIELD_PINNED_CONTINUATION)) {
+			if (J9VM_ARE_PINNED_YIELDABLE_VIRTUALTHREADS_ACTIVE(vm)) {
 				j9objectmonitor_t lock = 0;
 				j9objectmonitor_t *lockEA = NULL;
 				J9ObjectMonitor *objectMonitor = NULL;
@@ -107,7 +107,7 @@ Fast_java_lang_Object_notify(J9VMThread *currentThread, j9object_t receiverObjec
 		if (VM_ObjectMonitor::getMonitorForNotify(currentThread, receiverObject, &monitorPtr, true)) {
 #if JAVA_SPEC_VERSION >= 24
 			J9JavaVM *vm = currentThread->javaVM;
-			if (J9_ARE_ANY_BITS_SET(vm->extendedRuntimeFlags3, J9_EXTENDED_RUNTIME3_YIELD_PINNED_CONTINUATION)) {
+			if (J9VM_ARE_PINNED_YIELDABLE_VIRTUALTHREADS_ACTIVE(vm)) {
 				j9objectmonitor_t lock = 0;
 				j9objectmonitor_t *lockEA = NULL;
 				J9ObjectMonitor *objectMonitor = NULL;

runtime/vm/monhelpers.c

@@ -115,7 +115,7 @@ objectMonitorExit(J9VMThread* vmStruct, j9object_t object)
 
 					omrthread_monitor_exit(monitor);
 
-					if (J9_ARE_ANY_BITS_SET(vm->extendedRuntimeFlags3, J9_EXTENDED_RUNTIME3_YIELD_PINNED_CONTINUATION)
+					if (J9VM_ARE_PINNED_YIELDABLE_VIRTUALTHREADS_ACTIVE(vm)
 					&& (0 != objectMonitor->virtualThreadWaitCount)
 					) {
 						J9VM_SEND_VIRTUAL_UNBLOCKER_THREAD_SIGNAL(vm);
@@ -314,7 +314,7 @@ objectMonitorExit(J9VMThread* vmStruct, j9object_t object)
 #endif /*  JAVA_SPEC_VERSION >= 24 */
 		rc = omrthread_monitor_exit((omrthread_monitor_t)monitor);
 #if JAVA_SPEC_VERSION >= 24
-		if (J9_ARE_ANY_BITS_SET(vm->extendedRuntimeFlags3, J9_EXTENDED_RUNTIME3_YIELD_PINNED_CONTINUATION)
+		if (J9VM_ARE_PINNED_YIELDABLE_VIRTUALTHREADS_ACTIVE(vm)
 		&& (0 != objectMonitor->virtualThreadWaitCount)
 		) {
 			J9VM_SEND_VIRTUAL_UNBLOCKER_THREAD_SIGNAL(vm);

runtime/vm/threadhelp.cpp

@@ -465,7 +465,7 @@ notifyUnblocker(void *userData)
 {
 	J9VMThread *currentThread = (J9VMThread *)userData;
 	J9JavaVM *vm = currentThread->javaVM;
-	if (J9_ARE_ANY_BITS_SET(vm->extendedRuntimeFlags3, J9_EXTENDED_RUNTIME3_YIELD_PINNED_CONTINUATION)) {
+	if (J9VM_ARE_PINNED_YIELDABLE_VIRTUALTHREADS_ACTIVE(vm)) {
 		J9VM_SEND_VIRTUAL_UNBLOCKER_THREAD_SIGNAL(vm);
 		Trc_VM_ThreadHelp_notifyUnblocker(currentThread);
 	}