Skip to content

Commit

Permalink
Merge pull request #20313 from babsingh/v0.48.0-release
Browse files Browse the repository at this point in the history
(0.48) Return NULL from getStackTraceForThread for unsteady virtual threads
  • Loading branch information
pshipton authored Oct 8, 2024
2 parents 4bb34eb + bc274dd commit 12f8df7
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion runtime/jcl/common/getstacktrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,16 @@ getStackTraceForThread(J9VMThread *currentThread, J9VMThread *targetThread, UDAT
*/
walkState.skipCount = 0;
rc = vmfns->walkContinuationStackFrames(currentThread, targetThread->currentContinuation, threadObject, &walkState);
} else if (isVirtual && (threadObject != targetThread->threadObject)) {
} else if (isVirtual
&& ((threadObject != targetThread->threadObject)
|| (-1 == J9OBJECT_I64_LOAD(currentThread, threadObject, vm->virtualThreadInspectorCountOffset)))
) {
/* If the virtual thread object doesn't match the current thread object, it must have unmounted
* from this carrier thread, return NULL and the JCL code will handle the retry.
*
* If inspectorCount is -1, then the virtual thread is in an unsteady state (mounting or unmounting).
* In such cases, NULL should be returned and the JCL code should retry in order to avoid unexpected
* behavior.
*/
vmfns->resumeThreadForInspection(currentThread, targetThread);
goto done;
Expand Down

0 comments on commit 12f8df7

Please sign in to comment.