From 95834963f1c34b843d93f89efde53aaabdfe03eb Mon Sep 17 00:00:00 2001 From: Neerad Somanchi Date: Thu, 4 Apr 2019 09:38:27 -0700 Subject: [PATCH] Update thread pattern for java 11 --- src/main/java/io/airlift/stackfold/StackFolder.java | 2 +- src/test/resources/stack.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/airlift/stackfold/StackFolder.java b/src/main/java/io/airlift/stackfold/StackFolder.java index f83fdbb..db9cbf4 100644 --- a/src/main/java/io/airlift/stackfold/StackFolder.java +++ b/src/main/java/io/airlift/stackfold/StackFolder.java @@ -24,7 +24,7 @@ public final class StackFolder { - private static final Pattern THREAD_INFO_PATTERN = Pattern.compile("^\"(.*)\"\\s*(?:#(\\d+))?\\s*(daemon)?\\s*prio=(\\d+)\\s*(?:os_prio=(\\d+))?\\s*tid=(\\w+)\\s*nid=(\\w+)\\s*([^\\[]*)(?:\\[([^\\]]*)\\])?$"); + private static final Pattern THREAD_INFO_PATTERN = Pattern.compile("^\"(.*)\"\\s*(?:#(\\d+))?\\s*(daemon)?\\s*prio=(\\d+)\\s*(?:os_prio=(\\d+))?\\s*(?:cpu=([\\w\\.]+))?\\s*(?:elapsed=([\\w\\.]+))?\\s*tid=(\\w+)\\s*nid=(\\w+)\\s*([^\\[]*)(?:\\[([^\\]]*)\\])?$"); private static final Pattern STACK_ELEMENT_PATTERN = Pattern.compile("(?:at)?\\s*([^\\(]+)\\.([^\\(]+)(?:\\(([^:]+)(?::(\\d+))?\\))?"); private static final Pattern WAIT_ON_PATTERN = Pattern.compile("- parking to wait for <(\\w+)> \\(a (\\S+)\\)"); private static final Pattern LOCKED_PATTERN = Pattern.compile("- locked <(\\w+)> \\(a (\\S+)\\)"); diff --git a/src/test/resources/stack.txt b/src/test/resources/stack.txt index e827d38..d1aa2b3 100644 --- a/src/test/resources/stack.txt +++ b/src/test/resources/stack.txt @@ -14,7 +14,7 @@ Full thread dump Java HotSpot(TM) 64-Bit Server VM (23.25-b01 mixed mode): java.lang.Thread.State: RUNNABLE No compile task -"Signal Dispatcher" daemon prio=5 tid=0x00007fda14895800 nid=0x5003 runnable [0x0000000000000000] +"Signal Dispatcher" #4 daemon prio=9 os_prio=0 cpu=0.26ms elapsed=27760.92s tid=0x00007f76101acdf0 nid=0x193 runnable [0x0000000000000000] java.lang.Thread.State: RUNNABLE "Finalizer" daemon prio=5 tid=0x00007fda14858000 nid=0x3f03 in Object.wait() [0x000000018d8a5000]