[Swift-commit] r7099 - branches/release-0.94/src/org/griphyn/vdl/karajan

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-09-21 23:17:32 -0500 (Sat, 21 Sep 2013)
New Revision: 7099

Modified:
   branches/release-0.94/src/org/griphyn/vdl/karajan/HangChecker.java
Log:
port of fixes to jvm thread dumps from trunk

Modified: branches/release-0.94/src/org/griphyn/vdl/karajan/HangChecker.java
===================================================================
--- branches/release-0.94/src/org/griphyn/vdl/karajan/HangChecker.java	2013-09-22 04:05:35 UTC (rev 7098)
+++ branches/release-0.94/src/org/griphyn/vdl/karajan/HangChecker.java	2013-09-22 04:17:32 UTC (rev 7099)
@@ -145,9 +145,12 @@
     }
 
     private void printThreadInfo(PrintStream pw, ThreadInfo ti) {
-        pw.println("\tThread \"" + ti.getThreadName() + "\" (" + hex(ti.getThreadId()) + ")");
+        pw.println("\tThread \"" + ti.getThreadName() + "\" (" + hex(ti.getThreadId()) + ") " + ti.getThreadState());
         LockInfo l = ti.getLockInfo();
-        pw.println("\t\twaiting for " + format(l) + " held by " + ti.getLockOwnerName() + " (" + hex(ti.getLockOwnerId()) + ")");
+        if (l != null) {
+            pw.println("\t\twaiting for " + format(l) + 
+                    (ti.getLockOwnerName() == null ? "" : " held by " + ti.getLockOwnerName() + " (" + hex(ti.getLockOwnerId()) + ")"));
+        }
         Map<StackTraceElement, MonitorInfo> mlocs = new HashMap<StackTraceElement, MonitorInfo>();
         MonitorInfo[] mis = ti.getLockedMonitors();
         if (mis.length > 0) {
@@ -167,7 +170,7 @@
         pw.println("\tStack trace:");
         StackTraceElement[] stes = ti.getStackTrace();
         for (StackTraceElement ste : stes) {
-            pw.print("\t\t" + ste.getClassName() + "." + ste.getMethodName() + ":" + ste.getLineNumber());
+            pw.print("\t\t" + ste.getClassName() + "." + ste.getMethodName() + formatLineNumber(":", ste.getLineNumber()));
             if (mlocs.containsKey(ste)) {
                 pw.print(" -> locked " + format(mlocs.get(ste)));
             }
@@ -176,8 +179,22 @@
         pw.println();
     }
 
+    private String formatLineNumber(String prefix, int n) {
+        if (n < 0) {
+            return "";
+        }
+        else {
+            return prefix + String.valueOf(n);
+        }
+    }
+
     private String format(LockInfo l) {
-        return l.getClassName() + " (" + hex(l.getIdentityHashCode()) + ")";
+        if (l != null) {
+            return l.getClassName() + " (" + hex(l.getIdentityHashCode()) + ")";
+        }
+        else {
+            return "<unknown>";
+        }
     }
 
     private String hex(long x) {