Add support for new VirtualThread states in JVMTI

Signed-off-by: Jack Lu <[email protected]>
eclipse-openj9 · Nov 13, 2024 · 41ede8d · 41ede8d
1 parent 22733c4
commit 41ede8d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/runtime/jvmti/jvmtiHelpers.cpp b/runtime/jvmti/jvmtiHelpers.cpp
@@ -900,16 +900,33 @@ getVirtualThreadState(J9VMThread *currentThread, jthread thread)
 			case JVMTI_VTHREAD_STATE_UNPARKED:
 			case JVMTI_VTHREAD_STATE_YIELDING:
 			case JVMTI_VTHREAD_STATE_YIELDED:
+#if JAVA_SPEC_VERSION >= 24
+			case JVMTI_VTHREAD_STATE_UNBLOCKED:
+			case JVMTI_VTHREAD_STATE_WAITING:
+			case JVMTI_VTHREAD_STATE_TIMED_WAITING:
+#endif /* JAVA_SPEC_VERSION >= 24 */
 				rc = JVMTI_JAVA_LANG_THREAD_STATE_RUNNABLE;
 				break;
 			case JVMTI_VTHREAD_STATE_PINNED:
 			case JVMTI_VTHREAD_STATE_PARKED:
+#if JAVA_SPEC_VERSION >= 24
+			case JVMTI_VTHREAD_STATE_WAIT:
+#endif /* JAVA_SPEC_VERSION >= 24 */
 				rc = JVMTI_JAVA_LANG_THREAD_STATE_WAITING | JVMTI_THREAD_STATE_PARKED;
 				break;
 			case JVMTI_VTHREAD_STATE_TIMED_PINNED:
 			case JVMTI_VTHREAD_STATE_TIMED_PARKED:
+#if JAVA_SPEC_VERSION >= 24
+			case JVMTI_VTHREAD_STATE_TIMED_WAIT:
+#endif /* JAVA_SPEC_VERSION >= 24 */
 				rc = JVMTI_JAVA_LANG_THREAD_STATE_TIMED_WAITING | JVMTI_THREAD_STATE_PARKED;
 				break;
+#if JAVA_SPEC_VERSION >= 24
+			case JVMTI_VTHREAD_STATE_BLOCKING:
+			case JVMTI_VTHREAD_STATE_BLOCKED:
+				rc = JVMTI_JAVA_LANG_THREAD_STATE_BLOCKED;
+				break;
+#endif /* JAVA_SPEC_VERSION >= 24 */
 			case JVMTI_VTHREAD_STATE_TERMINATED:
 				rc = JVMTI_JAVA_LANG_THREAD_STATE_TERMINATED;
 				break;

diff --git a/runtime/oti/jvmtiInternal.h b/runtime/oti/jvmtiInternal.h
@@ -587,6 +587,15 @@ typedef struct jvmtiGcp_translation {
 #define JVMTI_VTHREAD_STATE_UNPARKED 9
 #define JVMTI_VTHREAD_STATE_YIELDING 10
 #define JVMTI_VTHREAD_STATE_YIELDED 11
+#if JAVA_SPEC_VERSION >= 24
+#define JVMTI_VTHREAD_STATE_BLOCKING  12
+#define JVMTI_VTHREAD_STATE_BLOCKED   13
+#define JVMTI_VTHREAD_STATE_UNBLOCKED 14
+#define JVMTI_VTHREAD_STATE_WAITING   15
+#define JVMTI_VTHREAD_STATE_WAIT      16
+#define JVMTI_VTHREAD_STATE_TIMED_WAITING 17
+#define JVMTI_VTHREAD_STATE_TIMED_WAIT 18
+#endif /* JAVA_SPEC_VERSION >= 24 */
 #define JVMTI_VTHREAD_STATE_TERMINATED 99
 #define JVMTI_VTHREAD_STATE_SUSPENDED (1 << 8)
 #endif /* JAVA_SPEC_VERSION >= 19 */