Skip to content

Commit bdfa15d

Browse files
plummercjplummercj
committedJan 18, 2022
8250801: Add clhsdb "threadcontext" command
Reviewed-by: sspitsyn, kevinw
·
JEP-429-branchpoint
1 parent fd9fb9a commit bdfa15d

File tree

3 files changed

+167
-5
lines changed

3 files changed

+167
-5
lines changed
 

‎src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/CommandProcessor.java

+39-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2005, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -1671,19 +1671,54 @@ public void doit(Tokens t) {
16711671
}
16721672
}
16731673
},
1674+
new Command("threadcontext", "threadcontext [-v] { -a | id }", false) {
1675+
public void doit(Tokens t) {
1676+
boolean verbose = false;
1677+
if (t.countTokens() == 2) {
1678+
if (t.nextToken().equals("-v")) {
1679+
verbose = true;
1680+
} else {
1681+
usage();
1682+
return;
1683+
}
1684+
}
1685+
if (t.countTokens() != 1) {
1686+
usage();
1687+
return;
1688+
}
1689+
String id = t.nextToken();
1690+
Threads threads = VM.getVM().getThreads();
1691+
boolean all = id.equals("-a");
1692+
for (int i = 0; i < threads.getNumberOfThreads(); i++) {
1693+
JavaThread thread = threads.getJavaThreadAt(i);
1694+
ByteArrayOutputStream bos = new ByteArrayOutputStream();
1695+
thread.printThreadIDOn(new PrintStream(bos));
1696+
if (all || bos.toString().equals(id)) {
1697+
out.format("Thread \"%s\" id=%s Address=%s\n",
1698+
thread.getThreadName(), bos.toString(), thread.getAddress());
1699+
thread.printThreadContextOn(out, verbose);
1700+
out.println(" ");
1701+
if (!all) return;
1702+
}
1703+
}
1704+
if (!all) {
1705+
out.println("Couldn't find thread " + id);
1706+
}
1707+
}
1708+
},
16741709
new Command("thread", "thread { -a | id }", false) {
16751710
public void doit(Tokens t) {
16761711
if (t.countTokens() != 1) {
16771712
usage();
16781713
} else {
1679-
String name = t.nextToken();
1714+
String id = t.nextToken();
16801715
Threads threads = VM.getVM().getThreads();
1681-
boolean all = name.equals("-a");
1716+
boolean all = id.equals("-a");
16821717
for (int i = 0; i < threads.getNumberOfThreads(); i++) {
16831718
JavaThread thread = threads.getJavaThreadAt(i);
16841719
ByteArrayOutputStream bos = new ByteArrayOutputStream();
16851720
thread.printThreadIDOn(new PrintStream(bos));
1686-
if (all || bos.toString().equals(name)) {
1721+
if (all || bos.toString().equals(id)) {
16871722
out.println("Thread " + bos.toString() + " Address " + thread.getAddress());
16881723
thread.printInfoOn(out);
16891724
out.println(" ");

‎src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java

+20-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -481,6 +481,25 @@ public Address lastSPDbg() {
481481
return access.getLastSP(addr);
482482
}
483483

484+
// Print the contents of all registers in the thread's context
485+
public void printThreadContextOn(PrintStream out, boolean verbose){
486+
ThreadContext tc = getThreadProxy().getContext();
487+
for (int r = 0; r < tc.getNumRegisters(); r++) {
488+
Address regAddr = tc.getRegisterAsAddress(r);
489+
System.out.format("%s: %s", tc.getRegisterName(r), regAddr);
490+
if (regAddr == null) {
491+
System.out.println();
492+
} else {
493+
PointerLocation l = PointerFinder.find(regAddr);
494+
if (l.isUnknown()) {
495+
System.out.println();
496+
} else {
497+
System.out.print(": ");
498+
l.printOn(System.out, false, verbose);
499+
}
500+
}
501+
}
502+
}
484503

485504
public void printThreadInfoOn(PrintStream out){
486505
Oop threadOop = this.getThreadObj();

‎test/hotspot/jtreg/serviceability/sa/ClhsdbThreadContext.java

+108
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
/*
2+
* Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
import java.util.HashMap;
25+
import java.util.List;
26+
import java.util.Map;
27+
28+
import jdk.test.lib.apps.LingeredApp;
29+
import jtreg.SkippedException;
30+
31+
/**
32+
* @test
33+
* @summary Test clhsdb where command
34+
* @requires vm.hasSA
35+
* @library /test/lib
36+
* @run main/othervm ClhsdbThreadContext
37+
*/
38+
39+
public class ClhsdbThreadContext {
40+
public static void main(String[] args) throws Exception {
41+
System.out.println("Starting ClhsdbThreadContext test");
42+
43+
LingeredApp theApp = null;
44+
try {
45+
ClhsdbLauncher test = new ClhsdbLauncher();
46+
theApp = LingeredApp.startApp();
47+
System.out.println("Started LingeredApp with pid " + theApp.getPid());
48+
49+
// Run threadcontext on all threads
50+
String cmdStr = "threadcontext -a";
51+
List<String> cmds = List.of(cmdStr);
52+
Map<String, List<String>> expStrMap = new HashMap<>();
53+
expStrMap.put(cmdStr, List.of(
54+
"Thread \"Common-Cleaner\"",
55+
"Thread \"Service Thread\"",
56+
"Thread \"Finalizer\"",
57+
"Thread \"SteadyStateThread\"",
58+
"In java stack for thread \"SteadyStateThread\""));
59+
String cmdOutput = test.run(theApp.getPid(), cmds, expStrMap, null);
60+
61+
// Run threadcontext on all threads in verbose mode
62+
cmdStr = "threadcontext -v -a";
63+
cmds = List.of(cmdStr);
64+
expStrMap = new HashMap<>();
65+
expStrMap.put(cmdStr, List.of(
66+
"Thread \"Common-Cleaner\"",
67+
"Thread \"Service Thread\"",
68+
"Thread \"Finalizer\"",
69+
"Thread \"SteadyStateThread\""));
70+
Map<String, List<String>> unexpStrMap = new HashMap<>();
71+
unexpStrMap.put(cmdStr, List.of(
72+
"In java stack for thread \"SteadyStateThread\""));
73+
test.run(theApp.getPid(), cmds, expStrMap, unexpStrMap);
74+
75+
// Look for a line like the following and parse the threadID out of it.
76+
// Thread "SteadyStateThread" id=18010 Address=0x000014bf103eaf50
77+
String[] parts = cmdOutput.split("Thread \"SteadyStateThread\" id=");
78+
String[] tokens = parts[1].split(" ");
79+
String threadID = tokens[0];
80+
81+
// Run threadcontext on the SteadyStateThread in verbose mode
82+
cmdStr = "threadcontext -v " + threadID;
83+
cmds = List.of(cmdStr);
84+
expStrMap = new HashMap<>();
85+
expStrMap.put(cmdStr, List.of(
86+
"Thread \"SteadyStateThread\"",
87+
"java.lang.Thread.State: BLOCKED",
88+
"In java stack \\[0x\\p{XDigit}+,0x\\p{XDigit}+,0x\\p{XDigit}+\\] for thread"));
89+
unexpStrMap = new HashMap<>();
90+
unexpStrMap.put(cmdStr, List.of(
91+
"Thread \"Common-Cleaner\"",
92+
"Thread \"Service Thread\"",
93+
"Thread \"Finalizer\""));
94+
test.run(theApp.getPid(), cmds, expStrMap, unexpStrMap);
95+
96+
// Run threadcontext on all threads in verbose mode
97+
98+
} catch (SkippedException se) {
99+
throw se;
100+
} catch (Exception ex) {
101+
throw new RuntimeException("Test ERROR " + ex, ex);
102+
} finally {
103+
LingeredApp.stopApp(theApp);
104+
}
105+
106+
System.out.println("Test PASSED");
107+
}
108+
}

0 commit comments

Comments
 (0)
Please sign in to comment.