vjtop 打印线程时输出更多信息 #127

.gitignore

@@ -3,7 +3,6 @@
 .project
 .settings/
 
-
 # Intellij project files
 *.iml
 .idea/
@@ -16,4 +15,4 @@ vip-java-standard.md
 release.sh
 vjmap/vjmap/
 vjtop/vjtop/
-release.properties
+vjmxcli/vjmxcli

vjtop/src/main/java/com/vip/vjtools/vjtop/TopThreadInfo.java

@@ -27,7 +27,6 @@ public TopCpuResult topCpuThreads(ThreadInfoMode mode, int threadLimit) throws I
 		try {
 			long tids[] = vmInfo.getAllThreadIds();
 
-
 			int mapSize = tids.length * 2;
 			result.threadCpuTotalTimes = new LongObjectHashMap<>(mapSize);
 			result.threadCpuDeltaTimes = new LongObjectHashMap<>(mapSize);

vjtop/src/main/java/com/vip/vjtools/vjtop/VMDetailView.java

@@ -13,7 +13,6 @@
 
 @SuppressWarnings("restriction")
 public class VMDetailView {
-
 	private static final int DEFAULT_WIDTH = 100;
 	private static final int MIN_WIDTH = 80;
 
@@ -51,6 +50,10 @@ public VMDetailView(VMInfo vmInfo, OutputFormat format, ContentMode contentMode,
 
 		this.interval = interval;
 		setWidth(width);
+
+		if (contentMode == ContentMode.all || contentMode == ContentMode.thread) {
+			vmInfo.initThreadInfoAbility();
+		}
 	}
 
 	public void printView() throws Exception {
@@ -491,11 +494,25 @@ public void printTopStack() throws IOException {
 
 	public StackTraceElement[] printSingleThread(ThreadInfo info) {
 		StackTraceElement[] trace = info.getStackTrace();
-		System.out.println(" " + info.getThreadId() + ": \"" + info.getThreadName() + "\"" + System.lineSeparator()
-				+ "   java.lang.Thread.State: " + info.getThreadState().toString());
+		String blockedMsg;
+		if (vmInfo.threadContentionMonitoringSupported) {
+			blockedMsg = " (blocked:" + info.getBlockedCount() + "/" + info.getBlockedTime() + "ms, wait:"
+					+ info.getWaitedCount() + "/" + info.getWaitedTime() + "ms)";
+		} else {
+			blockedMsg = " (blocked:" + info.getBlockedCount() + ",wait:" + info.getWaitedCount() + ")";
+		}
+
+		System.out.println(" " + info.getThreadId() + ": \"" + info.getThreadName() + "\"" + blockedMsg
+				+ System.lineSeparator() + "   java.lang.Thread.State: " + info.getThreadState().toString());
+
 		for (StackTraceElement traceElement : trace) {
 			System.out.println("\tat " + traceElement);
 		}
+
+		if (info.getLockOwnerId() != -1) {
+			System.out.println(" blocked by thread:" + info.getLockOwnerId() + ":" + info.getLockOwnerName());
+		}
+
 		return trace;
 	}
 
@@ -542,7 +559,6 @@ public void printBlockedThreads() throws IOException {
 				printSingleThread(info);
 				counter++;
 			}
-
 		}
 
 		System.out.println(" Total " + counter + " blocked threads");

vjtop/src/main/java/com/vip/vjtools/vjtop/VMInfo.java

@@ -46,6 +46,7 @@ public class VMInfo {
 	public boolean processDataSupport = true;
 	public boolean threadCpuTimeSupported;
 	public boolean threadMemoryAllocatedSupported;
+	public boolean threadContentionMonitoringSupported;
 
 	public WarningRule warningRule = new WarningRule();
 
@@ -187,15 +188,17 @@ private void init() throws IOException {
 				.parseLong(jmxClient.getHotSpotDiagnosticMXBean().getVMOption("MaxDirectMemorySize").getValue());
 		maxDirectMemorySize = maxDirectMemorySize == 0 ? -1 : maxDirectMemorySize;
 
-		threadCpuTimeSupported = jmxClient.getThreadMXBean().isThreadCpuTimeSupported();
-		threadMemoryAllocatedSupported = jmxClient.getThreadMXBean().isThreadAllocatedMemorySupported();
-
 		processors = jmxClient.getOperatingSystemMXBean().getAvailableProcessors();
 		warningRule.updateProcessor(processors);
 
 		isLinux = System.getProperty("os.name").toLowerCase(Locale.US).contains("linux");
 	}
 
+	public void initThreadInfoAbility() throws IOException {
+		threadCpuTimeSupported = jmxClient.getThreadMXBean().isThreadCpuTimeSupported();
+		threadMemoryAllocatedSupported = jmxClient.getThreadMXBean().isThreadAllocatedMemorySupported();
+		threadContentionMonitoringSupported = jmxClient.getThreadMXBean().isThreadContentionMonitoringEnabled();
+	}
 
 	/**
 	 * Updates all jvm metrics to the most recent remote values
@@ -439,7 +442,6 @@ public long[] getThreadAllocatedBytes(long[] tids) throws IOException {
 		return jmxClient.getThreadMXBean().getThreadAllocatedBytes(tids);
 	}
 
-
 	private void initPerfCounters(Map<String, Counter> perfCounters) {
 		threadLiveCounter = (LongCounter) perfCounters.get("java.threads.live");
 		threadDaemonCounter = (LongCounter) perfCounters.get("java.threads.daemon");