archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8289284: jdk.tracePinnedThreads output confusing when pinned due to native frame

Browse source 
Reviewed-by: jpai, mchung
This commit is contained in:
Alan Bateman 2022-07-13 15:03:37 +00:00
parent 572c14efc6
commit f528124f57
4 changed files with 108 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/share/classes/java/lang/PinnedThreadPrinter.java
View file

@ -86,7 +86,7 @@ class PinnedThreadPrinter {
}
/**
* Prints the stack trace of the current mounted vthread continuation.
* Prints the continuation stack trace.
*
* @param printAll true to print all stack frames, false to only print the
* frames that are native or holding a monitor
@ -103,7 +103,7 @@ class PinnedThreadPrinter {
.filter(f -> (f.isNativeMethod() || f.getMonitors().length > 0))
.map(LiveStackFrame::getDeclaringClass)
.findFirst()
.ifPresent(klass -> {
.ifPresentOrElse(klass -> {
int hash = hash(stack);
Hashes hashes = HASHES.get(klass);
synchronized (hashes) {
@ -112,7 +112,7 @@ class PinnedThreadPrinter {
printStackTrace(stack, out, printAll);
}
}
});
}, () -> printStackTrace(stack, out, true)); // not found
}
private static void printStackTrace(List<LiveStackFrame> stack,
@ -122,9 +122,9 @@ class PinnedThreadPrinter {
for (LiveStackFrame frame : stack) {
var ste = frame.toStackTraceElement();
int monitorCount = frame.getMonitors().length;
if (monitorCount > 0 || frame.isNativeMethod()) {
if (monitorCount > 0) {
out.format(" %s <== monitors:%d%n", ste, monitorCount);
} else if (printAll) {
} else if (frame.isNativeMethod() || printAll) {
out.format(" %s%n", ste);
}
}