From f80bcfccfb676107f182b1b62e13bc1fb66ff1ef Mon Sep 17 00:00:00 2001
From: Johan Walles <walles@spotify.com>
Date: Fri, 21 Nov 2014 16:31:57 +0100
Subject: [PATCH 1/6] Work in progress show top running methods

---
 analyze.js | 53 +++++++++++++++++++++++++++++------------------------
 index.html | 10 +++++++++-
 tests.js   | 28 ++++++++++++++++++++--------
 3 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/analyze.js b/analyze.js
index 9e7adac..c1d0422 100644
--- a/analyze.js
+++ b/analyze.js
@@ -23,15 +23,13 @@ function analyzeTextfield() { // jshint ignore: line
     var text = document.getElementById("TEXTAREA").value;
 
     var analyzer = new Analyzer(text);
-    setOutputHtml(analyzer.toHtml());
+    setHtml("OUTPUT", analyzer.toHtml());
 
     var ignores = analyzer.toIgnoresHtml();
-    if (ignores.length > 0) {
-        setIgnoredHtml(ignores);
-    } else {
-        var ignoredDiv = document.getElementById('IGNORED_DIV');
-        ignoredDiv.style.display = 'none';
-    }
+    setHtml("IGNORED", ignores);
+
+    var running = analyzer.toRunningHtml();
+    setHtml("RUNNING", running);
 }
 
 function htmlEscape(unescaped) {
@@ -41,20 +39,12 @@ function htmlEscape(unescaped) {
     return escaped;
 }
 
-function setOutputHtml(html) {
-    var output = document.getElementById("OUTPUT");
-    output.innerHTML = html;
+function setHtml(name, html) {
+    var destination = document.getElementById(name);
+    destination.innerHTML = html;
 
-    var outputDiv = document.getElementById('OUTPUT_DIV');
-    outputDiv.style.display = 'inline';
-}
-
-function setIgnoredHtml(html) {
-    var ignoredTable = document.getElementById("IGNORED");
-    ignoredTable.innerHTML = html;
-
-    var ignoredDiv = document.getElementById('IGNORED_DIV');
-    ignoredDiv.style.display = 'inline';
+    var div = document.getElementById(name + '_DIV');
+    div.style.display = (html.length > 0) ? 'inline' : 'none';
 }
 
 // Extracts a substring from a string.
@@ -92,7 +82,7 @@ function Thread(line) {
         var match = line.match(THREAD_STATE);
         if (match !== null) {
             this.threadState = match[1];
-            this.running = (this.threadState === "RUNNING") && (this.state === 'running');
+            this.running = (this.threadState === "RUNNABLE") && (this.state === 'runnable');
             return true;
         }
 
@@ -196,9 +186,11 @@ function StringCounter() {
         var string = "";
         var countedStrings = this.getStrings();
         for (var i = 0; i < countedStrings.length; i++) {
+            if (string.length > 0) {
+                string += '\n';
+            }
             string += countedStrings[i].count +
-                " " + countedStrings[i].string +
-                '\n';
+                " " + countedStrings[i].string;
         }
         return string;
     };
@@ -385,7 +377,7 @@ function Analyzer(text) {
     };
 
     this.toIgnoresString = function() {
-        return this._ignores.toString();
+        return this._ignores.toString() + '\n';
     };
 
     this.toIgnoresHtml = function() {
@@ -405,6 +397,19 @@ function Analyzer(text) {
         return this._getCountedRunningMethods().toString();
     };
 
+    this.toRunningHtml = function() {
+        var html = "";
+        var countedRunning = this._getCountedRunningMethods();
+        for (var i = 0; i < countedRunning.length; i++) {
+            html += '<tr><td class="right-align">' +
+                countedRunning[i].count +
+                '</td><td class="raw">' +
+                " " + htmlEscape(countedRunning[i].string) +
+                "</td></tr>\n";
+        }
+        return html;
+    };
+
     this._getCountedRunningMethods = function() {
         var countedRunning = new StringCounter();
         for (var i = 0; i < this.threads.length; i++) {
diff --git a/index.html b/index.html
index 119d23c..236e03a 100644
--- a/index.html
+++ b/index.html
@@ -36,6 +36,14 @@ <h1>Java Thread Dump Analyzer</h1>
     <p>This page is client-side only, and no data will leave your
       computer when you click Analyze.</p>
 
+    <div id="RUNNING_DIV" style="display: none;">
+      <hr/>
+      <h2>Top Running Methods</h2>
+      <table id="RUNNING" class="ignored"
+             summary="Top methods from all threads that are running">
+      </table>
+    </div>
+
     <div id="OUTPUT_DIV" style="display: none;">
       <hr/>
       <div id="OUTPUT"></div>
@@ -44,7 +52,7 @@ <h1>Java Thread Dump Analyzer</h1>
 
     <div id="IGNORED_DIV" style="display: none;">
       <hr/>
-      <h2>Ignored input lines</h2>
+      <h2>Ignored Input Lines</h2>
       <p><a href="https://github.com/spotify/threaddump-analyzer/blob/gh-pages/README.md#todo">
           See TODO list for which of these there are plans for already:</a></p>
       <table id="IGNORED" class="ignored"
diff --git a/tests.js b/tests.js
index 764aea4..ebd6651 100644
--- a/tests.js
+++ b/tests.js
@@ -82,28 +82,28 @@ QUnit.test( "sleeping thread", function(assert) {
 });
 
 // Our definition of a "running" thread is one that is both in
-// Thread.State running and free text state running.
+// Thread.State RUNNABLE and free text state "runnable".
 QUnit.test("thread.running", function(assert) {
     var thread;
 
-    thread = new Thread('"thread" prio=10 running');
-    thread.addStackLine("	java.lang.Thread.State: RUNNING");
+    thread = new Thread('"thread" prio=10 runnable');
+    thread.addStackLine("	java.lang.Thread.State: RUNNABLE");
     assert.ok(thread.running);
 
-    thread = new Thread('"thread" prio=10 not running');
-    thread.addStackLine("	java.lang.Thread.State: RUNNING");
+    thread = new Thread('"thread" prio=10 not runnable');
+    thread.addStackLine("	java.lang.Thread.State: RUNNABLE");
     assert.ok(!thread.running);
 
-    thread = new Thread('"thread" prio=10 running');
+    thread = new Thread('"thread" prio=10 runnable');
     thread.addStackLine("	java.lang.Thread.State: TERMINATED");
     assert.ok(!thread.running);
 
-    thread = new Thread('"thread" prio=10 not running');
+    thread = new Thread('"thread" prio=10 not runnable');
     thread.addStackLine("	java.lang.Thread.State: TERMINATED");
     assert.ok(!thread.running);
 
     // Thread without Thread.State
-    thread = new Thread('"thread" prio=10 running');
+    thread = new Thread('"thread" prio=10 runnable');
     assert.ok(!thread.running);
 });
 
@@ -239,9 +239,13 @@ QUnit.test("extract regex from string", function(assert) {
 QUnit.test("identical string counter", function(assert) {
     var counter = new StringCounter();
     assert.deepEqual(counter.getStrings().length, 0);
+    assert.equal(counter.toString(), "");
 
     counter.addString("hej");
     assert.deepEqual(counter.getStrings(), [{count:1, string:"hej"}]);
+    assert.deepEqual(counter.toString().split('\n'), [
+        "1 hej"
+    ]);
 
     counter.addString("nej");
     counter.addString("nej");
@@ -250,6 +254,10 @@ QUnit.test("identical string counter", function(assert) {
                          {count:2, string:"nej"},
                          {count:1, string:"hej"}
                      ]);
+    assert.deepEqual(counter.toString().split('\n'), [
+        "2 nej",
+        "1 hej"
+    ]);
 
     counter.addString("hej");
     counter.addString("hej");
@@ -258,4 +266,8 @@ QUnit.test("identical string counter", function(assert) {
                          {count:3, string:"hej"},
                          {count:2, string:"nej"}
                      ]);
+    assert.deepEqual(counter.toString().split('\n'), [
+        "3 hej",
+        "2 nej"
+    ]);
 });

From b6538912d50a5e74760d84159051a39f7516b5b1 Mon Sep 17 00:00:00 2001
From: Johan Walles <johan.walles@gmail.com>
Date: Sun, 23 Nov 2014 12:59:34 +0100
Subject: [PATCH 2/6] Fix Analyzer._getCountedRunningMethods()

Before this change it did a toString() before returning that it
shouldn't.
---
 analyze.js | 2 +-
 test.html  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/analyze.js b/analyze.js
index c1d0422..e160c7e 100644
--- a/analyze.js
+++ b/analyze.js
@@ -426,7 +426,7 @@ function Analyzer(text) {
             countedRunning.addString(runningMethod);
         }
 
-        return countedRunning.getStrings();
+        return countedRunning;
     };
 
     this.threads = [];
diff --git a/test.html b/test.html
index be663c9..8a9b411 100644
--- a/test.html
+++ b/test.html
@@ -776,7 +776,8 @@
 1 Full thread dump Java HotSpot(TM) 64-Bit Server VM (20.65-b04-466.1 mixed mode):
 1 JNI global references: 8210
 </pre>
-    <pre id="sample-running" style="display: none;">
-</pre>
+    <pre id="sample-running" style="display: none;">2 java.net.PlainSocketImpl.socketAccept(Native Method)
+1 java.lang.UNIXProcess.waitForProcessExit(Native Method)
+1 sun.nio.ch.KQueueArrayWrapper.kevent0(Native Method)</pre>
   </body>
 </html>

From 31e1859f620a7a5397a89aea5aa65e60cca6503e Mon Sep 17 00:00:00 2001
From: Johan Walles <johan.walles@gmail.com>
Date: Sun, 23 Nov 2014 13:09:21 +0100
Subject: [PATCH 3/6] Give the StringCounter a toHtml() method

... and use it to create both the Ignored and the Top Running tables.
---
 analyze.js | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/analyze.js b/analyze.js
index e160c7e..7b8f620 100644
--- a/analyze.js
+++ b/analyze.js
@@ -195,6 +195,19 @@ function StringCounter() {
         return string;
     };
 
+    this.toHtml = function() {
+        var html = "";
+        var countedStrings = this.getStrings();
+        for (var i = 0; i < countedStrings.length; i++) {
+            html += '<tr><td class="right-align">' +
+                countedStrings[i].count +
+                '</td><td class="raw">' +
+                " " + htmlEscape(countedStrings[i].string) +
+                "</td></tr>\n";
+        }
+        return html;
+    };
+
     this._stringsToCounts = {};
 }
 
@@ -381,16 +394,7 @@ function Analyzer(text) {
     };
 
     this.toIgnoresHtml = function() {
-        var html = "";
-        var countedIgnores = this._ignores.getStrings();
-        for (var i = 0; i < countedIgnores.length; i++) {
-            html += '<tr><td class="right-align">' +
-                countedIgnores[i].count +
-                '</td><td class="raw">' +
-                " " + htmlEscape(countedIgnores[i].string) +
-                "</td></tr>\n";
-        }
-        return html;
+        return this._ignores.toHtml() + "\n";
     };
 
     this.toRunningString = function() {
@@ -398,16 +402,7 @@ function Analyzer(text) {
     };
 
     this.toRunningHtml = function() {
-        var html = "";
-        var countedRunning = this._getCountedRunningMethods();
-        for (var i = 0; i < countedRunning.length; i++) {
-            html += '<tr><td class="right-align">' +
-                countedRunning[i].count +
-                '</td><td class="raw">' +
-                " " + htmlEscape(countedRunning[i].string) +
-                "</td></tr>\n";
-        }
-        return html;
+        return this._getCountedRunningMethods().toHtml();
     };
 
     this._getCountedRunningMethods = function() {

From 5f97ba637b769b7b76683d5b71c0a3040140d61c Mon Sep 17 00:00:00 2001
From: Johan Walles <johan.walles@gmail.com>
Date: Sun, 23 Nov 2014 13:19:50 +0100
Subject: [PATCH 4/6] Cosmetic web page changes

The most visible one is that the Top Running Methods section isn't red
any more.
---
 analyze.js | 10 +++++++---
 index.html |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/analyze.js b/analyze.js
index 7b8f620..f3a7018 100644
--- a/analyze.js
+++ b/analyze.js
@@ -202,7 +202,7 @@ function StringCounter() {
             html += '<tr><td class="right-align">' +
                 countedStrings[i].count +
                 '</td><td class="raw">' +
-                " " + htmlEscape(countedStrings[i].string) +
+                htmlEscape(countedStrings[i].string) +
                 "</td></tr>\n";
         }
         return html;
@@ -358,6 +358,10 @@ function Analyzer(text) {
     };
 
     this.toHtml = function() {
+        if (this.threads.length === 0) {
+            return "";
+        }
+
         var threadsAndStacks = this._toThreadsAndStacks();
 
         var asHtml = "";
@@ -394,7 +398,7 @@ function Analyzer(text) {
     };
 
     this.toIgnoresHtml = function() {
-        return this._ignores.toHtml() + "\n";
+        return this._ignores.toHtml();
     };
 
     this.toRunningString = function() {
@@ -417,7 +421,7 @@ function Analyzer(text) {
                 continue;
             }
 
-            var runningMethod = thread.frames[0].replace(/^\s+at /, '');
+            var runningMethod = thread.frames[0].replace(/^\s+at\s+/, '');
             countedRunning.addString(runningMethod);
         }
 
diff --git a/index.html b/index.html
index 236e03a..7b8041a 100644
--- a/index.html
+++ b/index.html
@@ -39,7 +39,7 @@ <h1>Java Thread Dump Analyzer</h1>
     <div id="RUNNING_DIV" style="display: none;">
       <hr/>
       <h2>Top Running Methods</h2>
-      <table id="RUNNING" class="ignored"
+      <table id="RUNNING"
              summary="Top methods from all threads that are running">
       </table>
     </div>

From da297f10193df709eab1a23176d5a6df27a19b7c Mon Sep 17 00:00:00 2001
From: Johan Walles <johan.walles@gmail.com>
Date: Sun, 23 Nov 2014 13:23:20 +0100
Subject: [PATCH 5/6] README: Top Running Methods section done

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 2edfcde..4734480 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,6 @@ The Java Thread Dump Analyzer is licensed under
 the copyright belongs to Spotify AB.
 
 ## TODO
-* List top RUNNING methods before everything else. I have a thread
-  dump taken on a system that was swapping basically getting the GC
-  stuck. With a list of top RUNNING methods it should be possible to
-  see this from the analysis.
-
 * Make the Thread class parse held locks, waited-for locks and
 waited-for condition variables from the thread dump.
 
@@ -120,3 +115,8 @@ obvious if we need to add something.
 * Move styling into CSS.
 
 * Turn the Ignored Lines section at the bottom into an HTML table.
+
+* List top RUNNING methods before everything else. I have a thread
+  dump taken on a system that was swapping basically getting the GC
+  stuck. With a list of top RUNNING methods it should be possible to
+  see this from the analysis.

From 2705237c0a7a6517dc26f230a6054b84f683a642 Mon Sep 17 00:00:00 2001
From: Johan Walles <johan.walles@gmail.com>
Date: Sun, 23 Nov 2014 13:39:01 +0100
Subject: [PATCH 6/6] README: Add various TODO items

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 4734480..cf9e34a 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,14 @@ The Java Thread Dump Analyzer is licensed under
 the copyright belongs to Spotify AB.
 
 ## TODO
+* For top running methods belonging to only one thread, make a link
+from the top list method to the thread executing it.
+
+* Add a Clear button next to the Analyze button.
+
+* Say "... threads with no stack" for threads with no stack, rather
+  than "... threads with this stack".
+
 * Make the Thread class parse held locks, waited-for locks and
 waited-for condition variables from the thread dump.