Merge pull request #19842 from fengxue-IS/vthread-alive-check

Update VThread alive check to check continuation state
eclipse-openj9 · Jul 19, 2024 · 08e67ec · 08e67ec
2 parents 881038d + b14cd71
commit 08e67ec
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/runtime/jvmti/jvmtiHelpers.cpp b/runtime/jvmti/jvmtiHelpers.cpp
@@ -179,7 +179,14 @@ getVMThread(J9VMThread *currentThread, jthread thread, J9VMThread **vmThreadPtr,
 				targetThread = carrierVMThread;
 			}
 		}
-		isThreadAlive = (JVMTI_VTHREAD_STATE_NEW != vthreadState) && (JVMTI_VTHREAD_STATE_TERMINATED != vthreadState);
+		j9object_t continuationObj = J9VMJAVALANGVIRTUALTHREAD_CONT(currentThread, threadObject);
+		ContinuationState continuationState = *VM_ContinuationHelpers::getContinuationStateAddress(currentThread, continuationObj);
+		if ((JVMTI_VTHREAD_STATE_NEW != vthreadState)
+		&& (JVMTI_VTHREAD_STATE_TERMINATED != vthreadState)
+		&& !VM_ContinuationHelpers::isFinished(continuationState)
+		) {
+			isThreadAlive = TRUE;
+		}
 	} else
 #endif /* JAVA_SPEC_VERSION >= 19 */
 	{