stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8181647: jhsdb jstack could not output thread name

Browse Source 
Standardized thread information across jstack, jhsdb jstack, and jhsdb jstack --mixed

Reviewed-by: ysuenaga, poonam
This commit is contained in:
Chihiro Ito 2017-07-06 09:31:01 -04:00 committed by David Buck
parent 3df0f64e1f
commit 5ae3d88bb7
8 changed files with 311 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/OopUtilities.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -59,20 +59,20 @@ public class OopUtilities {
// parkBlocker field is new since 1.6
private static OopField threadParkBlockerField;
private static IntField threadPriorityField;
private static BooleanField threadDaemonField;
// possible values of java_lang_Thread::ThreadStatus
private static int THREAD_STATUS_NEW;
/*
Other enum constants are not needed as of now. Uncomment these as and when needed.
private static int THREAD_STATUS_RUNNABLE;
private static int THREAD_STATUS_SLEEPING;
private static int THREAD_STATUS_IN_OBJECT_WAIT;
private static int THREAD_STATUS_IN_OBJECT_WAIT_TIMED;
private static int THREAD_STATUS_PARKED;
private static int THREAD_STATUS_PARKED_TIMED;
private static int THREAD_STATUS_BLOCKED_ON_MONITOR_ENTER;
private static int THREAD_STATUS_TERMINATED;
*/
private static int THREAD_STATUS_RUNNABLE;
private static int THREAD_STATUS_SLEEPING;
private static int THREAD_STATUS_IN_OBJECT_WAIT;
private static int THREAD_STATUS_IN_OBJECT_WAIT_TIMED;
private static int THREAD_STATUS_PARKED;
private static int THREAD_STATUS_PARKED_TIMED;
private static int THREAD_STATUS_BLOCKED_ON_MONITOR_ENTER;
private static int THREAD_STATUS_TERMINATED;
// java.util.concurrent.locks.AbstractOwnableSynchronizer fields
private static OopField absOwnSyncOwnerThreadField;
@ -229,20 +229,19 @@ public class OopUtilities {
threadStatusField = (IntField) k.findField("threadStatus", "I");
threadParkBlockerField = (OopField) k.findField("parkBlocker",
"Ljava/lang/Object;");
threadPriorityField = (IntField) k.findField("priority", "I");
threadDaemonField = (BooleanField) k.findField("daemon", "Z");
TypeDataBase db = VM.getVM().getTypeDataBase();
THREAD_STATUS_NEW = db.lookupIntConstant("java_lang_Thread::NEW").intValue();
/*
Other enum constants are not needed as of now. Uncomment these as and when needed.
THREAD_STATUS_RUNNABLE = db.lookupIntConstant("java_lang_Thread::RUNNABLE").intValue();
THREAD_STATUS_SLEEPING = db.lookupIntConstant("java_lang_Thread::SLEEPING").intValue();
THREAD_STATUS_IN_OBJECT_WAIT = db.lookupIntConstant("java_lang_Thread::IN_OBJECT_WAIT").intValue();
THREAD_STATUS_IN_OBJECT_WAIT_TIMED = db.lookupIntConstant("java_lang_Thread::IN_OBJECT_WAIT_TIMED").intValue();
THREAD_STATUS_PARKED = db.lookupIntConstant("java_lang_Thread::PARKED").intValue();
THREAD_STATUS_PARKED_TIMED = db.lookupIntConstant("java_lang_Thread::PARKED_TIMED").intValue();
THREAD_STATUS_BLOCKED_ON_MONITOR_ENTER = db.lookupIntConstant("java_lang_Thread::BLOCKED_ON_MONITOR_ENTER").intValue();
THREAD_STATUS_TERMINATED = db.lookupIntConstant("java_lang_Thread::TERMINATED").intValue();
*/
THREAD_STATUS_RUNNABLE = db.lookupIntConstant("java_lang_Thread::RUNNABLE").intValue();
THREAD_STATUS_SLEEPING = db.lookupIntConstant("java_lang_Thread::SLEEPING").intValue();
THREAD_STATUS_IN_OBJECT_WAIT = db.lookupIntConstant("java_lang_Thread::IN_OBJECT_WAIT").intValue();
THREAD_STATUS_IN_OBJECT_WAIT_TIMED = db.lookupIntConstant("java_lang_Thread::IN_OBJECT_WAIT_TIMED").intValue();
THREAD_STATUS_PARKED = db.lookupIntConstant("java_lang_Thread::PARKED").intValue();
THREAD_STATUS_PARKED_TIMED = db.lookupIntConstant("java_lang_Thread::PARKED_TIMED").intValue();
THREAD_STATUS_BLOCKED_ON_MONITOR_ENTER = db.lookupIntConstant("java_lang_Thread::BLOCKED_ON_MONITOR_ENTER").intValue();
THREAD_STATUS_TERMINATED = db.lookupIntConstant("java_lang_Thread::TERMINATED").intValue();
if (Assert.ASSERTS_ENABLED) {
// it is okay to miss threadStatusField, because this was
@ -331,4 +330,46 @@ public class OopUtilities {
return absOwnSyncOwnerThreadField.getValue(oop);
}
}
public static int threadOopGetPriority(Oop threadOop) {
initThreadFields();
if (threadPriorityField != null) {
return threadPriorityField.getValue(threadOop);
} else {
return 0;
}
}
public static boolean threadOopGetDaemon(Oop threadOop) {
initThreadFields();
if (threadDaemonField != null) {
return threadDaemonField.getValue(threadOop);
} else {
return false;
}
}
public static String threadOopGetThreadStatusName(Oop threadOop) {
int status = OopUtilities.threadOopGetThreadStatus(threadOop);
if(status == THREAD_STATUS_NEW){
return "NEW";
}else if(status == THREAD_STATUS_RUNNABLE){
return "RUNNABLE";
}else if(status == THREAD_STATUS_SLEEPING){
return "TIMED_WAITING (sleeping)";
}else if(status == THREAD_STATUS_IN_OBJECT_WAIT){
return "WAITING (on object monitor)";
}else if(status == THREAD_STATUS_IN_OBJECT_WAIT_TIMED){
return "TIMED_WAITING (on object monitor)";
}else if(status == THREAD_STATUS_PARKED){
return "WAITING (parking)";
}else if(status == THREAD_STATUS_PARKED_TIMED){
return "TIMED_WAITING (parking)";
}else if(status == THREAD_STATUS_BLOCKED_ON_MONITOR_ENTER){
return "BLOCKED (on object monitor)";
}else if(status == THREAD_STATUS_TERMINATED){
return "TERMINATED";
}
return "UNKNOWN";
}
}

32
hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/JavaThread.java
View File

@ -70,6 +70,8 @@ public class JavaThread extends Thread {
private static int NOT_TERMINATED;
private static int EXITING;
private static final String ADDRESS_FORMAT = VM.getVM().isLP64() ? "0x%016x" : "0x%08x";
static {
VM.registerVMInitializedObserver(new Observer() {
public void update(Observable o, Object data) {
@ -475,4 +477,34 @@ public class JavaThread extends Thread {
return access.getLastSP(addr);
}
public void printThreadInfoOn(PrintStream out){
Oop threadOop = this.getThreadObj();
out.print("\"");
out.print(this.getThreadName());
out.print("\" #");
out.print(OopUtilities.threadOopGetTID(threadOop));
if(OopUtilities.threadOopGetDaemon(threadOop)){
out.print(" daemon");
}
out.print(" prio=");
out.print(OopUtilities.threadOopGetPriority(threadOop));
out.print(" tid=");
out.print(this.getAddress());
out.print(" nid=");
out.print(String.format("0x%x ",this.getOSThread().threadId()));
out.print(getOSThread().getThreadState().getPrintVal());
out.print(" [");
if(this.getLastJavaSP() == null){
out.print(String.format(ADDRESS_FORMAT,0L));
} else {
out.print(this.getLastJavaSP().andWithMask(~0xFFF));
}
out.println("]");
out.print(" java.lang.Thread.State: ");
out.println(OopUtilities.threadOopGetThreadStatusName(threadOop));
out.print(" JavaThread state: _thread_");
out.println(this.getThreadState().toString().toLowerCase());
}
}

50
hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/OSThread.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -33,6 +33,19 @@ import sun.jvm.hotspot.types.*;
public class OSThread extends VMObject {
private static JIntField interruptedField;
private static Field threadIdField;
private static CIntegerField threadStateField;
// ThreadStates read from underlying process
private static int ALLOCATED;
private static int INITIALIZED;
private static int RUNNABLE;
private static int MONITOR_WAIT;
private static int CONDVAR_WAIT;
private static int OBJECT_WAIT;
private static int BREAKPOINTED;
private static int SLEEPING;
private static int ZOMBIE;
static {
VM.registerVMInitializedObserver(new Observer() {
public void update(Observable o, Object data) {
@ -45,6 +58,17 @@ public class OSThread extends VMObject {
Type type = db.lookupType("OSThread");
interruptedField = type.getJIntField("_interrupted");
threadIdField = type.getField("_thread_id");
threadStateField = type.getCIntegerField("_state");
ALLOCATED = db.lookupIntConstant("ALLOCATED").intValue();
INITIALIZED = db.lookupIntConstant("INITIALIZED").intValue();
RUNNABLE = db.lookupIntConstant("RUNNABLE").intValue();
MONITOR_WAIT = db.lookupIntConstant("MONITOR_WAIT").intValue();
CONDVAR_WAIT = db.lookupIntConstant("CONDVAR_WAIT").intValue();
OBJECT_WAIT = db.lookupIntConstant("OBJECT_WAIT").intValue();
BREAKPOINTED = db.lookupIntConstant("BREAKPOINTED").intValue();
SLEEPING = db.lookupIntConstant("SLEEPING").intValue();
ZOMBIE = db.lookupIntConstant("ZOMBIE").intValue();
}
public OSThread(Address addr) {
@ -59,4 +83,28 @@ public class OSThread extends VMObject {
return threadIdField.getJInt(addr);
}
public ThreadState getThreadState() {
int val = (int)threadStateField.getValue(addr);
if (val == ALLOCATED) {
return ThreadState.ALLOCATED;
} else if (val == INITIALIZED) {
return ThreadState.INITIALIZED;
} else if (val == RUNNABLE) {
return ThreadState.RUNNABLE;
} else if (val == MONITOR_WAIT) {
return ThreadState.MONITOR_WAIT;
} else if (val == CONDVAR_WAIT) {
return ThreadState.CONDVAR_WAIT;
} else if (val == OBJECT_WAIT) {
return ThreadState.OBJECT_WAIT;
} else if (val == BREAKPOINTED) {
return ThreadState.BREAKPOINTED;
} else if (val == SLEEPING) {
return ThreadState.SLEEPING;
} else if (val == ZOMBIE) {
return ThreadState.ZOMBIE;
} else {
throw new RuntimeException("Illegal thread state " + val);
}
}
}

60
hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/runtime/ThreadState.java Normal file
View File

@ -0,0 +1,60 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package sun.jvm.hotspot.runtime;
/** This is a type-safe enum mirroring the ThreadState enum in
osThread.hpp. The conversion between the underlying ints
and these values is done in OSThread. */
public class ThreadState {
private String printVal;
/** Memory has been allocated but not initialized */
public static final ThreadState ALLOCATED = new ThreadState("allocated");
/** The thread has been initialized but yet started */
public static final ThreadState INITIALIZED = new ThreadState("initialized");
/** Has been started and is runnable, but not necessarily running */
public static final ThreadState RUNNABLE = new ThreadState("runnable");
/** Waiting on a contended monitor lock */
public static final ThreadState MONITOR_WAIT = new ThreadState("waiting for monitor entry");
/** Waiting on a condition variable */
public static final ThreadState CONDVAR_WAIT = new ThreadState("waiting on condition");
/** Waiting on an Object.wait() call */
public static final ThreadState OBJECT_WAIT = new ThreadState("in Object.wait()");
/** Suspended at breakpoint */
public static final ThreadState BREAKPOINTED = new ThreadState("at breakpoint");
/** Thread.sleep() */
public static final ThreadState SLEEPING = new ThreadState("sleeping");
/** All done, but not reclaimed yet */
public static final ThreadState ZOMBIE = new ThreadState("zombie");
private ThreadState(String printVal){
this.printVal = printVal;
}
public String getPrintVal() {
return printVal;
}
}

6
hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/PStack.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -88,6 +88,10 @@ public class PStack extends Tool {
out.print("----------------- ");
out.print(th);
out.println(" -----------------");
JavaThread jthread = (JavaThread) proxyToThread.get(th);
if (jthread != null) {
jthread.printThreadInfoOn(out);
}
while (f != null) {
ClosestSymbol sym = f.closestSymbolToPC();
Address pc = f.pc();

11
hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/tools/StackTrace.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -74,14 +74,7 @@ public class StackTrace extends Tool {
int i = 1;
for (JavaThread cur = threads.first(); cur != null; cur = cur.next(), i++) {
if (cur.isJavaThread()) {
Address sp = cur.getLastJavaSP();
tty.print("Thread ");
cur.printThreadIDOn(tty);
tty.print(": (state = " + cur.getThreadState());
if (verbose) {
tty.println(", current Java SP = " + sp);
}
tty.println(')');
cur.printThreadInfoOn(tty);
try {
for (JavaVFrame vf = cur.getLastJavaVFrameDbg(); vf != null; vf = vf.javaSender()) {
Method method = vf.getMethod();

16
hotspot/src/share/vm/runtime/vmStructs.cpp
View File

@ -981,6 +981,7 @@ typedef RehashableHashtable<Symbol*, mtSymbol> RehashableSymbolHashtable;
/************/ \
\
volatile_nonstatic_field(OSThread, _interrupted, jint) \
volatile_nonstatic_field(OSThread, _state, ThreadState) \
\
/************************/ \
/* OopMap and OopMapSet */ \
@ -2186,6 +2187,7 @@ typedef RehashableHashtable<Symbol*, mtSymbol> RehashableSymbolHashtable;
declare_integer_type(Generation::Name) \
declare_integer_type(InstanceKlass::ClassState) \
declare_integer_type(JavaThreadState) \
declare_integer_type(ThreadState) \
declare_integer_type(Location::Type) \
declare_integer_type(Location::Where) \
declare_integer_type(Flag::Flags) \
@ -2443,6 +2445,20 @@ typedef RehashableHashtable<Symbol*, mtSymbol> RehashableSymbolHashtable;
declare_constant(JavaThread::_not_terminated) \
declare_constant(JavaThread::_thread_exiting) \
\
/*******************/ \
/* JavaThreadState */ \
/*******************/ \
\
declare_constant(ALLOCATED) \
declare_constant(INITIALIZED) \
declare_constant(RUNNABLE) \
declare_constant(MONITOR_WAIT) \
declare_constant(CONDVAR_WAIT) \
declare_constant(OBJECT_WAIT) \
declare_constant(BREAKPOINTED) \
declare_constant(SLEEPING) \
declare_constant(ZOMBIE) \
\
/******************************/ \
/* Klass misc. enum constants */ \
/******************************/ \

83
hotspot/test/serviceability/sa/JhsdbThreadInfoTest.java Normal file
View File

@ -0,0 +1,83 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import jdk.test.lib.apps.LingeredApp;
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.Platform;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
/*
* @test
* @library /test/lib
* @run main JhsdbThreadInfoTest
*/
public class JhsdbThreadInfoTest {
public static void main(String[] args) throws Exception {
if (!Platform.shouldSAAttach()) {
System.out.println("SA attach not expected to work - test skipped.");
return;
}
LingeredApp app = null;
try {
app = LingeredApp.startApp(Utils.getVmOptions());
System.out.println("Started LingeredApp with pid " + app.getPid());
JDKToolLauncher jhsdbLauncher = JDKToolLauncher.createUsingTestJDK("jhsdb");
jhsdbLauncher.addToolArg("jstack");
jhsdbLauncher.addToolArg("--pid");
jhsdbLauncher.addToolArg(Long.toString(app.getPid()));
ProcessBuilder pb = new ProcessBuilder();
pb.command(jhsdbLauncher.getCommand());
Process jhsdb = pb.start();
jhsdb.waitFor();
OutputAnalyzer out = new OutputAnalyzer(jhsdb);
System.out.println(out.getStdout());
System.err.println(out.getStderr());
out.shouldMatch("\".+\" #\\d+ daemon prio=\\d+ tid=0x[0-9a-f]+ nid=0x[0-9a-f]+ .+ \\[0x[0-9a-f]+]");
out.shouldMatch("\"main\" #\\d+ prio=\\d+ tid=0x[0-9a-f]+ nid=0x[0-9a-f]+ .+ \\[0x[0-9a-f]+]");
out.shouldMatch(" java.lang.Thread.State: .+");
out.shouldMatch(" JavaThread state: _thread_.+");
out.shouldNotContain(" java.lang.Thread.State: UNKNOWN");
out.stderrShouldBeEmpty();
System.out.println("Test Completed");
} catch (InterruptedException ie) {
throw new Error("Problem awaiting the child process: " + ie, ie);
} catch (Exception attachE) {
throw new Error("Couldn't start jhsdb, attach to LingeredApp or match ThreadName: " + attachE);
} finally {
LingeredApp.stopApp(app);
}
}
}