From 22c6568748707643da72b5ad1f73d6437e6ac839 Mon Sep 17 00:00:00 2001
From: Chris Newland <chris@chrisnewland.com>
Date: Wed, 26 Aug 2015 23:30:24 +0100
Subject: [PATCH] JIT timeline shows all compile events per method including
 recompiles

---
 .../jitwatch/core/HotSpotLogParser.java       |  19 +-
 .../jitwatch/core/JITWatchConstants.java      |   2 +
 .../jitwatch/model/IMetaMember.java           |  17 +-
 .../jitwatch/model/JITDataModel.java          |   4 +-
 .../adoptopenjdk/jitwatch/model/JITEvent.java |   5 +-
 .../adoptopenjdk/jitwatch/model/JITStats.java |   2 +-
 .../adoptopenjdk/jitwatch/model/Journal.java  |  25 +-
 .../InliningFailReasonTopListVisitable.java   |   5 +-
 .../jitwatch/ui/AttributeTableRow.java        |   2 +-
 .../jitwatch/ui/JournalViewerStage.java       |   2 +-
 .../ui/graphing/AbstractGraphStage.java       |  62 +++-
 .../jitwatch/ui/graphing/CodeCacheStage.java  |   4 +-
 .../jitwatch/ui/graphing/HistoStage.java      |   9 +-
 .../jitwatch/ui/graphing/TimeLineStage.java   | 320 ++++++++++++------
 .../jitwatch/ui/sandbox/SandboxStage.java     |   1 +
 .../jitwatch/ui/toplist/TopListStage.java     |   6 +
 .../adoptopenjdk/jitwatch/util/ParseUtil.java |  44 ++-
 src/main/resources/examples/DeoptTest.java    |  49 +++
 18 files changed, 417 insertions(+), 161 deletions(-)
 create mode 100644 src/main/resources/examples/DeoptTest.java

diff --git a/src/main/java/org/adoptopenjdk/jitwatch/core/HotSpotLogParser.java b/src/main/java/org/adoptopenjdk/jitwatch/core/HotSpotLogParser.java
index 219bf594..b17d5e89 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/core/HotSpotLogParser.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/core/HotSpotLogParser.java
@@ -10,6 +10,7 @@
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_METHOD;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_NAME;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_STAMP;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_STAMP_COMPLETED;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.C1;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.C2;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.C2N;
@@ -662,9 +663,22 @@ private void handleTagQueued(Tag tag)
 		handleMethodLine(tag, EventType.QUEUE);
 	}
 
+	private void renameCompilationCompletedTimestamp(Tag tag)
+	{
+		String compilationCompletedStamp = tag.getAttribute(ATTR_STAMP);
+		
+		if (compilationCompletedStamp != null)
+		{
+			tag.getAttrs().remove(ATTR_STAMP);
+			tag.getAttrs().put(ATTR_STAMP_COMPLETED, compilationCompletedStamp);
+		}
+	}
+	
 	private void handleTagNMethod(Tag tag)
 	{
 		String attrCompiler = tag.getAttribute(ATTR_COMPILER);
+		
+		renameCompilationCompletedTimestamp(tag);
 
 		if (attrCompiler != null)
 		{
@@ -742,9 +756,8 @@ private void handleMethodLine(Tag tag, EventType eventType)
 	private IMetaMember handleMember(String signature, Map<String, String> attrs, EventType type)
 	{
 		IMetaMember metaMember = findMemberWithSignature(signature);
-
-		String stampAttr = attrs.get(ATTR_STAMP);
-		long stampTime = ParseUtil.parseStamp(stampAttr);
+		
+		long stampTime = ParseUtil.getStamp(attrs);
 
 		if (metaMember != null)
 		{
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/core/JITWatchConstants.java b/src/main/java/org/adoptopenjdk/jitwatch/core/JITWatchConstants.java
index 3e91e449..d0955b33 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/core/JITWatchConstants.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/core/JITWatchConstants.java
@@ -106,10 +106,12 @@ private JITWatchConstants()
 	public static final String ATTR_COMPILE_ID = "compile_id";
 	public static final String ATTR_COMPILE_KIND = "compile_kind";
 	public static final String ATTR_STAMP = "stamp";
+	public static final String ATTR_STAMP_COMPLETED = "stamp_completed";
 	public static final String ATTR_NAME = "name";
 	public static final String ATTR_BCI = "bci";
 	public static final String ATTR_CODE = "code";
 	public static final String ATTR_COMPILER = "compiler";
+	public static final String ATTR_LEVEL = "level";
 	public static final String ATTR_FREE_CODE_CACHE = "free_code_cache";
 	public static final String ATTR_NMSIZE = "nmsize";
 	public static final String ATTR_BYTES = "bytes";
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/model/IMetaMember.java b/src/main/java/org/adoptopenjdk/jitwatch/model/IMetaMember.java
index 64effae9..b92b19f5 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/model/IMetaMember.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/model/IMetaMember.java
@@ -14,8 +14,6 @@
 
 public interface IMetaMember
 {
-	List<String> getQueuedAttributes();
-
 	MetaClass getMetaClass();
 	
 	MemberBytecode getMemberBytecode();
@@ -26,21 +24,16 @@ public interface IMetaMember
 	Journal getJournal();
 
 	String getQueuedAttribute(String key);
-
-	List<String> getCompiledAttributes();
-
-	String getCompiledAttribute(String key);
-
-	void addCompiledAttribute(String key, String value);
-
+	List<String> getQueuedAttributes();
 	void setQueuedAttributes(Map<String, String> queuedAttributes);
-
 	boolean isQueued();
 
+	//TODO split task and nmethod attrs?
 	void setCompiledAttributes(Map<String, String> compiledAttributes);
-
 	void addCompiledAttributes(Map<String, String> additionalAttrs);
-
+	String getCompiledAttribute(String key);
+	List<String> getCompiledAttributes();
+	void addCompiledAttribute(String key, String value);
 	boolean isCompiled();
 
 	String toStringUnqualifiedMethodName(boolean fqParamTypes);
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/model/JITDataModel.java b/src/main/java/org/adoptopenjdk/jitwatch/model/JITDataModel.java
index 3298576e..5974100a 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/model/JITDataModel.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/model/JITDataModel.java
@@ -98,7 +98,7 @@ public JITStats getJITStats()
 
 	// ugly but better than using COWAL with so many writes
 	public void addEvent(JITEvent event)
-	{
+	{		
 		synchronized (jitEvents)
 		{
 			jitEvents.add(event);
@@ -106,7 +106,7 @@ public void addEvent(JITEvent event)
 	}
 
 	@Override
-	public synchronized List<JITEvent> getEventListCopy()
+	public List<JITEvent> getEventListCopy()
 	{
 		synchronized (jitEvents)
 		{
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/model/JITEvent.java b/src/main/java/org/adoptopenjdk/jitwatch/model/JITEvent.java
index cb6e8901..e3e3c4b7 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/model/JITEvent.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/model/JITEvent.java
@@ -5,9 +5,10 @@
  */
 package org.adoptopenjdk.jitwatch.model;
 
-import org.adoptopenjdk.jitwatch.util.StringUtil;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.C_COLON;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.C_SPACE;
 
-import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.*;
+import org.adoptopenjdk.jitwatch.util.StringUtil;
 
 public class JITEvent
 {
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/model/JITStats.java b/src/main/java/org/adoptopenjdk/jitwatch/model/JITStats.java
index cfad9c08..e01c85b9 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/model/JITStats.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/model/JITStats.java
@@ -258,7 +258,7 @@ public long getTotalCompileTime()
 
 	public long getTotalCompiledMethods()
 	{
-		return countC1 + countC2 + countC2N + countOSR;
+		return countC1 + countC2 + countC2N;
 	}
 
 	public long getNativeBytes()
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/model/Journal.java b/src/main/java/org/adoptopenjdk/jitwatch/model/Journal.java
index 57ee13d0..ea020869 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/model/Journal.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/model/Journal.java
@@ -5,10 +5,14 @@
  */
 package org.adoptopenjdk.jitwatch.model;
 
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.C_NEWLINE;
+
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
-import org.adoptopenjdk.jitwatch.core.JITWatchConstants;
+import org.adoptopenjdk.jitwatch.util.ParseUtil;
 
 public class Journal
 {
@@ -34,6 +38,18 @@ public List<Tag> getEntryList()
 		{
 			List<Tag> copy = new ArrayList<>(entryList);
 
+			Collections.sort(copy, new Comparator<Tag>()
+			{
+				@Override
+				public int compare(Tag tag1, Tag tag2)
+				{
+					long ts1 = ParseUtil.getStamp(tag1.getAttrs());
+					long ts2 = ParseUtil.getStamp(tag2.getAttrs());
+					
+					return Long.compare(ts1, ts2);
+				}
+			});
+
 			return copy;
 		}
 	}
@@ -43,12 +59,9 @@ public String toString()
 	{
 		StringBuilder builder = new StringBuilder();
 
-		synchronized (entryList)
+		for (Tag tag : getEntryList())
 		{
-			for (Tag tag : entryList)
-			{
-				builder.append(tag.toString(true)).append(JITWatchConstants.C_NEWLINE);
-			}
+			builder.append(tag.toString(true)).append(C_NEWLINE);
 		}
 
 		return builder.toString();
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/toplist/InliningFailReasonTopListVisitable.java b/src/main/java/org/adoptopenjdk/jitwatch/toplist/InliningFailReasonTopListVisitable.java
index 20080697..48852d49 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/toplist/InliningFailReasonTopListVisitable.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/toplist/InliningFailReasonTopListVisitable.java
@@ -32,7 +32,7 @@ public InliningFailReasonTopListVisitable(IReadOnlyJITDataModel model, boolean s
 
 	@Override
 	public void visit(IMetaMember metaMember)
-	{
+	{		
 		if (metaMember != null && metaMember.isCompiled())
 		{
 			try
@@ -52,6 +52,9 @@ private void processParseTag(Tag parseTag)
 		{
 			String tagName = child.getName();
 			Map<String, String> attrs = child.getAttrs();
+			
+			logger.info("processParseTag {}", child.toString(false));
+
 
 			switch (tagName)
 			{
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/ui/AttributeTableRow.java b/src/main/java/org/adoptopenjdk/jitwatch/ui/AttributeTableRow.java
index 1f58dbe1..9097dbaa 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/ui/AttributeTableRow.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/ui/AttributeTableRow.java
@@ -17,7 +17,7 @@ public AttributeTableRow(String type, String name, String value)
     {
         this.type = type;
         this.name = name;
-        this.value = StringUtil.formatThousands(value);
+        this.value = StringUtil.replaceXMLEntities(value);
     }
 
     public String getType()
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/ui/JournalViewerStage.java b/src/main/java/org/adoptopenjdk/jitwatch/ui/JournalViewerStage.java
index 494ec8c8..1345dfb3 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/ui/JournalViewerStage.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/ui/JournalViewerStage.java
@@ -50,7 +50,7 @@ public void handle(WindowEvent arg0)
 		int maxLineLength = 0;
 
 		List<Label> labels = new ArrayList<>();
-
+		
 		for (Tag tag : journal.getEntryList())
 		{
 			String[] tagLines = tag.toString().split(S_NEWLINE);
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/AbstractGraphStage.java b/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/AbstractGraphStage.java
index 5bf79160..f63e065c 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/AbstractGraphStage.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/AbstractGraphStage.java
@@ -8,15 +8,18 @@
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.event.EventHandler;
+import javafx.geometry.VPos;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.stage.WindowEvent;
 
 import org.adoptopenjdk.jitwatch.ui.JITWatchUI;
 import org.adoptopenjdk.jitwatch.util.StringUtil;
+import org.adoptopenjdk.jitwatch.util.UserInterfaceUtil;
 
 public abstract class AbstractGraphStage extends Stage
 {
@@ -24,9 +27,9 @@ public abstract class AbstractGraphStage extends Stage
 	protected GraphicsContext gc;
 	protected JITWatchUI parent;
 
-	protected static double graphGapLeft = 20.5;
-	protected static final double graphGapRight = 20.5;
-	protected static final double graphGapTop = 20.5;
+	protected double graphGapLeft = 20.5;
+	protected final double graphGapRight = 20.5;
+	protected final double graphGapTop = 20.5;
 
 	protected static final int[] Y_SCALE = new int[21];
 
@@ -46,6 +49,12 @@ public abstract class AbstractGraphStage extends Stage
 	protected long maxYQ;
 
 	private boolean xAxisTime = false;
+	
+	protected static final Font STANDARD_FONT = new Font(UserInterfaceUtil.FONT_MONOSPACE_FAMILY,
+			Double.valueOf(UserInterfaceUtil.FONT_MONOSPACE_SIZE));
+	
+	protected static final Font MEMBER_FONT = new Font(UserInterfaceUtil.FONT_MONOSPACE_FAMILY,
+			Double.valueOf(UserInterfaceUtil.FONT_MONOSPACE_SIZE) * 2.0);
 
 	static
 	{
@@ -101,15 +110,21 @@ public void changed(ObservableValue<? extends Number> arg0, Number arg1, Number
 
 	protected void baseRedraw()
 	{
+		gc.setFont(STANDARD_FONT);
+		
 		width = canvas.getWidth();
 		height = canvas.getHeight();
 		chartWidth = width - graphGapLeft - graphGapRight;
 		chartHeight = height - graphGapTop * 2;
 
+		setStrokeForAxis();
+
 		gc.setFill(Color.WHITE);
 		gc.fillRect(0, 0, width, height);
+		
 		gc.setFill(Color.rgb(210, 255, 255));
 		gc.fillRect(graphGapLeft, graphGapTop, chartWidth, chartHeight);
+		
 		gc.setStroke(Color.BLACK);
 		gc.strokeRect(graphGapLeft, graphGapTop, chartWidth, chartHeight);
 	}
@@ -141,11 +156,14 @@ private void drawXAxisTime()
 		while (gridX <= maxX)
 		{
 			double x = graphGapLeft + normaliseX(gridX);
+			
+			setStrokeForAxis();
 			gc.strokeLine(fix(x), fix(graphGapTop), fix(x), fix(graphGapTop + chartHeight));
 
 			boolean showMillis = maxX  < 5000;
 
-			gc.strokeText(StringUtil.formatTimestamp(gridX, showMillis), fix(x), fix(graphGapTop + chartHeight + 12));
+			setStrokeForText();
+			gc.fillText(StringUtil.formatTimestamp(gridX, showMillis), fix(x), fix(graphGapTop + chartHeight + 2));
 
 			gridX += xInc;
 		}
@@ -164,8 +182,12 @@ private void drawXAxis()
 		while (gridX <= maxX)
 		{
 			double x = graphGapLeft + normaliseX(gridX);
+			
+			setStrokeForAxis();
 			gc.strokeLine(fix(x), fix(graphGapTop), fix(x), fix(graphGapTop + chartHeight));
-			gc.strokeText(StringUtil.formatThousands(Long.toString(gridX)), fix(x), fix(graphGapTop + chartHeight + 12));
+			
+			setStrokeForText();
+			gc.fillText(StringUtil.formatThousands(Long.toString(gridX)), fix(x), fix(graphGapTop + chartHeight + 2));
 
 			gridX += xInc;
 		}
@@ -192,13 +214,27 @@ private void drawYAxis()
 			if (gridY >= minYQ)
 			{
 				double y = graphGapTop + normaliseY(gridY);
+				
+				setStrokeForAxis();
 				gc.strokeLine(fix(graphGapLeft), fix(y), fix(graphGapLeft + chartWidth), fix(y));
-				gc.strokeText(StringUtil.formatThousands(Long.toString(gridY)), fix(yLabelX), fix(y + 2));
+				
+				setStrokeForText();
+				gc.fillText(StringUtil.formatThousands(Long.toString(gridY)), fix(yLabelX), fix(y - getStringHeight() / 2));
 			}
 
 			gridY += yInc;
 		}
 	}
+	
+	protected double getApproximateStringWidth(String text)
+	{
+		return text.length() * gc.getFont().getSize() * 0.5;
+	}
+
+	protected double getStringHeight()
+	{
+		return gc.getFont().getSize();
+	}
 
 	private long getXStepTime()
 	{
@@ -279,4 +315,18 @@ protected double fix(double pixel)
 	{
 		return 0.5 + (int) pixel;
 	}
+	
+	protected void setStrokeForAxis()
+	{
+		gc.setStroke(Color.BLACK);
+		gc.setLineWidth(0.5);
+	}
+	
+	protected void setStrokeForText()
+	{
+		gc.setStroke(Color.BLACK);
+		gc.setFill(Color.BLACK);
+		gc.setLineWidth(1.0);
+		gc.setTextBaseline(VPos.TOP);
+	}
 }
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/CodeCacheStage.java b/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/CodeCacheStage.java
index 226b9561..c2adc38e 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/CodeCacheStage.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/CodeCacheStage.java
@@ -19,7 +19,6 @@
 import javafx.scene.Scene;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
 import javafx.stage.StageStyle;
 
 public class CodeCacheStage extends AbstractGraphStage
@@ -94,7 +93,6 @@ else if (freeCodeCache < minY)
 			double lastCY = graphGapTop + normaliseY(getFreeCodeCacheFromTag(firstTag));
 
 			gc.setStroke(Color.BLACK);
-			gc.setFont(new Font("monospace", 10));
 
 			Color colourLine = Color.BLUE;
 
@@ -120,7 +118,7 @@ else if (freeCodeCache < minY)
 		}
 		else
 		{
-			gc.strokeText("No code cache information in log", fix(10), fix(10));
+			gc.fillText("No code cache information in log", fix(10), fix(10));
 		}
 	}
 
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/HistoStage.java b/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/HistoStage.java
index 308505bf..7cf0fabd 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/HistoStage.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/HistoStage.java
@@ -127,6 +127,7 @@ public final void redraw()
 
                 double x = graphGapLeft + normaliseX(key);
 
+                gc.setLineWidth(2.0);
                 gc.setStroke(colourLine);
 
                 double y = graphGapTop + normaliseY(value);
@@ -146,17 +147,19 @@ public final void redraw()
             gc.strokeRect(fix(xPos), fix(yPos), fix(legendWidth), fix(legendHeight));
 
             xPos += 5;
-            yPos += 15;
+            yPos += 5;
 
             for (double percent : new double[] { 50, 75, 80, 85, 90, 95, 98, 99, 99.5, 99.9, 100 })
             {
-                gc.strokeText(percent + "% : " + histo.getPercentile(percent), fix(xPos), fix(yPos));
+        		setStrokeForText();
+                gc.fillText(percent + "% : " + histo.getPercentile(percent), fix(xPos), fix(yPos));
                 yPos += 20;
             }
         }
         else
         {
-            gc.strokeText("No data for histogram.", fix(graphGapLeft + 8), fix(graphGapTop + 16));
+			setStrokeForText();
+            gc.fillText("No data for histogram.", fix(graphGapLeft + 8), fix(graphGapTop + 16));
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/TimeLineStage.java b/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/TimeLineStage.java
index a2d09df0..b8e4ebce 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/TimeLineStage.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/ui/graphing/TimeLineStage.java
@@ -5,25 +5,29 @@
  */
 package org.adoptopenjdk.jitwatch.ui.graphing;
 
-import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_COMPILER;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.*;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_COMPILE_KIND;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_DECOMPILES;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.S_CLOSE_PARENTHESES;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.TAG_NMETHOD;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;
 
 import javafx.scene.Scene;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
-import javafx.scene.text.Font;
 import javafx.stage.StageStyle;
 
-import org.adoptopenjdk.jitwatch.model.EventType;
 import org.adoptopenjdk.jitwatch.model.IMetaMember;
 import org.adoptopenjdk.jitwatch.model.JITEvent;
 import org.adoptopenjdk.jitwatch.model.JITStats;
+import org.adoptopenjdk.jitwatch.model.Journal;
+import org.adoptopenjdk.jitwatch.model.Tag;
 import org.adoptopenjdk.jitwatch.ui.JITWatchUI;
 import org.adoptopenjdk.jitwatch.util.ParseUtil;
 import org.adoptopenjdk.jitwatch.util.StringUtil;
@@ -31,6 +35,12 @@
 
 public class TimeLineStage extends AbstractGraphStage
 {
+	private IMetaMember selectedMember = null;
+	private List<Tag> selectedMemberJournalTags = new ArrayList<>();
+	private int selectedTagIndex = 0;
+	private static final double MARKET_DIAMETER = 10;
+	private boolean labelLeft = true;
+
 	public TimeLineStage(final JITWatchUI parent)
 	{
 		super(parent, JITWatchUI.WINDOW_WIDTH, JITWatchUI.WINDOW_HEIGHT, true);
@@ -43,8 +53,6 @@ public TimeLineStage(final JITWatchUI parent)
 		canvas.widthProperty().bind(root.widthProperty());
 		canvas.heightProperty().bind(root.heightProperty());
 
-		gc.setFont(new Font("monospace", 10));
-
 		root.getChildren().add(canvas);
 
 		setTitle("Compilations Timeline");
@@ -55,159 +63,256 @@ public TimeLineStage(final JITWatchUI parent)
 		redraw();
 	}
 
+	private void processMemberEvents()
+	{
+		if (selectedMember != null)
+		{
+			Journal selectedJournal = selectedMember.getJournal();
+
+			if (selectedJournal != null)
+			{
+				selectedMemberJournalTags = selectedJournal.getEntryList();
+
+				Iterator<Tag> iter = selectedMemberJournalTags.iterator();
+
+				while (iter.hasNext())
+				{
+					Tag tag = iter.next();
+
+					if (!TAG_NMETHOD.equals(tag.getName()) && !TAG_TASK_QUEUED.equals(tag.getName()))
+					{
+						iter.remove();
+					}
+				}
+			}
+		}
+		else
+		{
+			selectedMemberJournalTags.clear();
+		}
+	}
+
 	@Override
 	public final void redraw()
 	{
 		super.baseRedraw();
 
-		List<JITEvent> events = parent.getJITDataModel().getEventListCopy();
+		gc.setFont(STANDARD_FONT);
 
-		Collections.sort(events, new Comparator<JITEvent>()
+		if (selectedMember != parent.getSelectedMember())
 		{
-			@Override
-			public int compare(JITEvent e1, JITEvent e2)
-			{
-				return Long.compare(e1.getStamp(), e2.getStamp());
-			}
-		});
+			selectedMember = parent.getSelectedMember();
+			processMemberEvents();
+		}
 
-		if (events.size() > 0)
-		{
-			minX = 0;
-			maxX = events.get(events.size() - 1).getStamp();
+		List<JITEvent> events = parent.getJITDataModel().getEventListCopy();
 
-			minY = 0;
-			maxY = 0;
+		selectedTagIndex = 0;
 
-			for (JITEvent event : events)
+		if (events.size() > 0)
+		{
+			Collections.sort(events, new Comparator<JITEvent>()
 			{
-				if (event.getEventType() != EventType.QUEUE)
+				@Override
+				public int compare(JITEvent e1, JITEvent e2)
 				{
-					maxY++;
+					return Long.compare(e1.getStamp(), e2.getStamp());
 				}
-			}
+			});
 
-			double lastCX = graphGapLeft + normaliseX(minX);
-			double lastCY = graphGapTop + normaliseY(0);
+			minX = 0;
+			maxX = events.get(events.size() - 1).getStamp();
+			maxX *= 1.1;
+			
+			minY = 0;
+
+			calculateMaxCompiles(events);
 
 			drawAxes();
 
-			IMetaMember selectedMember = parent.getSelectedMember();
+			drawEvents(events);
 
-			double compiledStampTime = -1;
+			showSelectedMemberLabel();
+		}
+		else
+		{
+			gc.fillText("No compilation information processed", fix(10), fix(10));
+		}
+	}
 
-			if (selectedMember != null)
-			{
-				// last compile stamp write wins - plot all?
-				String cStamp = selectedMember.getCompiledAttribute("stamp");
+	private void calculateMaxCompiles(List<JITEvent> events)
+	{
+		maxY = events.size();
+	}
 
-				if (cStamp != null)
-				{
-					compiledStampTime = ParseUtil.parseStamp(cStamp);
-				}
-			}
+	private void drawMemberEvents(long stamp, double yPos)
+	{
+		if (selectedTagIndex >= selectedMemberJournalTags.size())
+		{
+			return;
+		}
 
-			Color colourMarker = Color.BLUE;
+		Tag nextJournalEvent = selectedMemberJournalTags.get(selectedTagIndex);
 
-			gc.setFill(colourMarker);
-			gc.setStroke(colourMarker);
+		long journalEventTime = ParseUtil.getStamp(nextJournalEvent.getAttrs());
 
-			int cumC = 0;
-			int markerDiameter = 10;
+		if (journalEventTime == stamp)
+		{
+			selectedTagIndex++;
 
-			for (JITEvent event : events)
-			{
-				if (event.getEventType() != EventType.QUEUE)
-				{
-					long stamp = event.getStamp();
+			gc.setFill(Color.BLUE);
 
-					cumC++;
+			double smX = graphGapLeft + normaliseX(journalEventTime);
 
-					double x = graphGapLeft + normaliseX(stamp);
+			double blobX = fix(smX - MARKET_DIAMETER / 2);
+			double blobY = fix(yPos - MARKET_DIAMETER / 2);
 
-					double y = graphGapTop + normaliseY(cumC);
+			gc.fillOval(blobX, blobY, fix(MARKET_DIAMETER), fix(MARKET_DIAMETER));
 
+			String label = buildLabel(nextJournalEvent, journalEventTime);
 
-					gc.setLineWidth(2);
-					gc.strokeLine(fix(lastCX), fix(lastCY), fix(x), fix(y));
-					gc.setLineWidth(1);
+			double labelX;
+			double labelY;
 
-					lastCX = x;
-					lastCY = y;
+			if (labelLeft)
+			{
+				labelX = blobX - getApproximateStringWidth(label) - 8;
+				labelY = Math.min(blobY - getStringHeight() - 8, graphGapTop + chartHeight - 32);
 
-					if (compiledStampTime != -1 && stamp == compiledStampTime)
-					{
-						double smX = graphGapLeft + normaliseX(compiledStampTime);
+			}
+			else
+			{
+				labelX = blobX + 16;
+				labelY = Math.min(blobY, graphGapTop + chartHeight - 32);
+			}
+			
+			labelLeft = !labelLeft;
 
-						double blobX = fix(smX - markerDiameter / 2);
-						double blobY = fix(y - markerDiameter / 2);
+			drawLabel(label, labelX, labelY);
+		}
+	}
 
-						gc.fillOval(blobX, blobY, fix(markerDiameter),
-								fix(markerDiameter));
+	private void showSelectedMemberLabel()
+	{
+		if (selectedMember != null)
+		{
+			gc.setFont(MEMBER_FONT);
+			drawLabel(selectedMember.toString(), 56, 40);
+		}
+	}
 
-						StringBuilder selectedItemBuilder = new StringBuilder();
+	private void drawLabel(String text, double xPos, double yPos)
+	{
+		double boxPad = 4;
 
-						selectedItemBuilder.append(selectedMember.toStringUnqualifiedMethodName(false));
+		double boxWidth = getApproximateStringWidth(text) + boxPad * 2;
+		double boxHeight = getStringHeight() + boxPad * 2;
 
-						String compiler = selectedMember.getCompiledAttribute(ATTR_COMPILER);
+		gc.setFill(Color.WHITE);
 
-						if (compiler == null)
-						{
-							compiler = selectedMember.getCompiledAttribute(ATTR_COMPILE_KIND);
+		setStrokeForAxis();
+		gc.fillRect(fix(xPos), fix(yPos), fix(boxWidth), fix(boxHeight));
+		gc.strokeRect(fix(xPos), fix(yPos), fix(boxWidth), fix(boxHeight));
 
-							if (compiler == null)
-							{
-								compiler = "unknown!";
-							}
-						}
+		setStrokeForText();
+		gc.fillText(text, fix(xPos + boxPad), fix(yPos));
+	}
 
-						selectedItemBuilder.append(" compiled at ")
-								.append(StringUtil.formatTimestamp((long) compiledStampTime, true)).append(" by ").append(compiler);
+	private String buildLabel(Tag nextJournalEvent, long journalEventTime)
+	{
+		StringBuilder selectedItemBuilder = new StringBuilder();
 
-						String compiletime = selectedMember.getCompiledAttribute("compileMillis");
+		String tagName = nextJournalEvent.getName();
 
-						if (compiletime != null)
-						{
-							selectedItemBuilder.append(" in ").append(compiletime).append("ms");
-						}
+		if (TAG_TASK_QUEUED.equals(tagName))
+		{
+			selectedItemBuilder.append("Queued at ");
+			selectedItemBuilder.append(StringUtil.formatTimestamp((long) journalEventTime, true));
+		}
+		else
+		{
+			if (nextJournalEvent.getAttribute(ATTR_DECOMPILES) != null)
+			{
+				selectedItemBuilder.append("Recompiled at ");
+			}
+			else
+			{
+				selectedItemBuilder.append("Compiled at ");
+			}
 
-						double approxWidth = selectedItemBuilder.length() * 5.5;
+			selectedItemBuilder.append(StringUtil.formatTimestamp((long) journalEventTime, true));
 
-						double selectedLabelX;
+			String compiler = nextJournalEvent.getAttribute(ATTR_COMPILER);
+			
+			if (compiler == null)
+			{
+				compiler = "unknown!";
+			}
+			
+			selectedItemBuilder.append(" by ").append(compiler);
+			
+			String compileKind = nextJournalEvent.getAttribute(ATTR_COMPILE_KIND);
+			
+			if (compileKind != null)
+			{
+				selectedItemBuilder.append(C_OPEN_PARENTHESES).append(compileKind.toUpperCase()).append(C_CLOSE_PARENTHESES);
+			}
+			
+			String level = nextJournalEvent.getAttribute(ATTR_LEVEL);
+			
+			if (level != null)
+			{
+				selectedItemBuilder.append(" (Level ").append(level).append(C_CLOSE_PARENTHESES);
+			}
 
-						if (blobX + approxWidth > chartWidth)
-						{
-							selectedLabelX = blobX - approxWidth - 16;
-						}
-						else
-						{
-							selectedLabelX = blobX + 32;
-						}
+			String compiletime = selectedMember.getCompiledAttribute("compileMillis");
 
-						double selectedLabelY = Math.min(blobY+8, graphGapTop + chartHeight - 32);
+			if (compiletime != null)
+			{
+				selectedItemBuilder.append(" in ").append(compiletime).append("ms");
+			}
+		}
 
-			            gc.setFill(Color.WHITE);
-			            gc.setStroke(Color.BLACK);
+		return selectedItemBuilder.toString();
+	}
+
+	private void drawEvents(List<JITEvent> events)
+	{
+		Color colourMarker = Color.BLUE;
 
-			            gc.fillRect(fix(selectedLabelX-8), fix(selectedLabelY-12), fix(approxWidth), fix(18));
-			            gc.strokeRect(fix(selectedLabelX-8), fix(selectedLabelY-12), fix(approxWidth), fix(18));
+		int cumC = 0;
 
-						gc.strokeText(selectedItemBuilder.toString(), fix(selectedLabelX), fix(selectedLabelY));
+		double lastCX = graphGapLeft + normaliseX(minX);
+		double lastCY = graphGapTop + normaliseY(0);
 
-						compiledStampTime = -1;
+		for (JITEvent event : events)
+		{
+			// if (event.getEventType() != EventType.QUEUE)
+			{
 
-			            gc.setStroke(Color.BLUE);
+				long stamp = event.getStamp();
 
-					}
+				cumC++;
+
+				double x = graphGapLeft + normaliseX(stamp);
+
+				double y = graphGapTop + normaliseY(cumC);
+
+				if (selectedMemberJournalTags.size() > 0)
+				{
+					drawMemberEvents(stamp, y);
 				}
-			}
 
-			showStatsLegend(gc);
-		}
-		else
-		{
-			gc.strokeText("No compilation information processed", fix(10), fix(10));
+				gc.setStroke(colourMarker);
+				gc.setLineWidth(2);
+				gc.strokeLine(fix(lastCX), fix(lastCY), fix(x), fix(y));
+
+				lastCX = x;
+				lastCY = y;
+			}
 		}
+
+		showStatsLegend(gc);
 	}
 
 	private void showStatsLegend(GraphicsContext gc)
@@ -215,12 +320,13 @@ private void showStatsLegend(GraphicsContext gc)
 		JITStats stats = parent.getJITDataModel().getJITStats();
 
 		StringBuilder compiledStatsBuilder = new StringBuilder();
-		compiledStatsBuilder.append("Compiled: ").append(stats.getTotalCompiledMethods());
+		compiledStatsBuilder.append("Total Compilations: ").append(stats.getTotalCompiledMethods());
 		compiledStatsBuilder.append(" (C1: ").append(stats.getCountC1()).append(S_CLOSE_PARENTHESES);
 		compiledStatsBuilder.append(" (C2: ").append(stats.getCountC2()).append(S_CLOSE_PARENTHESES);
 		compiledStatsBuilder.append(" (C2N: ").append(stats.getCountC2N()).append(S_CLOSE_PARENTHESES);
 		compiledStatsBuilder.append(" (OSR: ").append(stats.getCountOSR()).append(S_CLOSE_PARENTHESES);
-		gc.setStroke(Color.BLACK);
-		gc.strokeText(compiledStatsBuilder.toString(), fix(graphGapLeft), fix(12));
+
+		setStrokeForText();
+		gc.fillText(compiledStatsBuilder.toString(), fix(graphGapLeft), fix(2));
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/ui/sandbox/SandboxStage.java b/src/main/java/org/adoptopenjdk/jitwatch/ui/sandbox/SandboxStage.java
index 2e4d6033..284603b8 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/ui/sandbox/SandboxStage.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/ui/sandbox/SandboxStage.java
@@ -323,6 +323,7 @@ public void handle(WindowEvent arg0)
 			{
 				saveEditorPaneConfig();
 
+				//TODO wrong - only close children
 				StageManager.closeAll();
 				closeListener.handleStageClosed(SandboxStage.this);
 			}
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/ui/toplist/TopListStage.java b/src/main/java/org/adoptopenjdk/jitwatch/ui/toplist/TopListStage.java
index 46ed1c94..e0553e7c 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/ui/toplist/TopListStage.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/ui/toplist/TopListStage.java
@@ -72,18 +72,24 @@ public void handle(WindowEvent arg0)
 
 		TopListWrapper tlLargestNative = new TopListWrapper("Largest Native Methods", new CompiledAttributeTopListVisitable(
 				parent.getJITDataModel(), ATTR_NMSIZE, true), new String[] { "Bytes", MEMBER });
+		
 		TopListWrapper tlInlineFailReasons = new TopListWrapper("Inlining Failure Reasons", new InliningFailReasonTopListVisitable(
 				parent.getJITDataModel(), true), new String[] { "Count", "Reason" });
+		
 		TopListWrapper tlIntrinsics = new TopListWrapper("Most-used Intrinsics", new MostUsedIntrinsicsTopListVisitable(
 				parent.getJITDataModel(), true), new String[] { "Count", "Intrinsic" });
+		
 		TopListWrapper tlLargestBytecode = new TopListWrapper("Largest Bytecode Methods", new CompiledAttributeTopListVisitable(
 				parent.getJITDataModel(), ATTR_BYTES, true), new String[] { "Bytes", MEMBER });
+		
 		TopListWrapper tlSlowestCompilation = new TopListWrapper("Slowest Compilation Times",
 				new CompiledAttributeTopListVisitable(parent.getJITDataModel(), ATTR_COMPILE_MILLIS, true), new String[] {
 						"Milliseconds",
 						MEMBER });
+		
 		TopListWrapper tlMostDecompiled = new TopListWrapper("Most Decompiled Methods", new CompiledAttributeTopListVisitable(
 				parent.getJITDataModel(), ATTR_DECOMPILES, true), new String[] { "Decompiles", MEMBER });
+		
 		TopListWrapper tlCompilationOrder = new TopListWrapper("Compilation Order", new AbstractTopListVisitable(
 				parent.getJITDataModel(), false)
 		{
diff --git a/src/main/java/org/adoptopenjdk/jitwatch/util/ParseUtil.java b/src/main/java/org/adoptopenjdk/jitwatch/util/ParseUtil.java
index 97f5b9e2..7c6d646e 100644
--- a/src/main/java/org/adoptopenjdk/jitwatch/util/ParseUtil.java
+++ b/src/main/java/org/adoptopenjdk/jitwatch/util/ParseUtil.java
@@ -9,6 +9,8 @@
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_HOLDER;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_NAME;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_RETURN;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_STAMP;
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.ATTR_STAMP_COMPLETED;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.C_CLOSE_ANGLE;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.C_DOT;
 import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.C_OBJECT_REF;
@@ -112,6 +114,23 @@ public static long parseStamp(String stamp)
 		else
 		{
 			logger.warn("Could not parse null stamp");
+			Thread.dumpStack();
+		}
+
+		return result;
+	}
+
+	public static long getStamp(Map<String, String> attrs)
+	{
+		long result = 0;
+
+		if (attrs.containsKey(ATTR_STAMP_COMPLETED))
+		{
+			result = parseStamp(attrs.get(ATTR_STAMP_COMPLETED));
+		}
+		else if (attrs.containsKey(ATTR_STAMP))
+		{
+			result = parseStamp(attrs.get(ATTR_STAMP));
 		}
 
 		return result;
@@ -130,7 +149,6 @@ public static double parseLocaleSafeDouble(String str)
 		catch (ParseException pe)
 		{
 			logger.warn("Could not parse {} as a Double", pe);
-			//TODO throw NumberFormatException?
 		}
 
 		return result;
@@ -852,20 +870,20 @@ public static List<String> getMethodTagArguments(Tag methodTag, IParseDictionary
 
 		return result;
 	}
-	
+
 	public static String getMethodName(String methodID, IParseDictionary parseDictionary)
 	{
 		String result = null;
-		
+
 		Tag methodTag = parseDictionary.getMethod(methodID);
-		
+
 		if (methodTag != null)
 		{
 			String methodName = methodTag.getAttribute(ATTR_NAME);
-			
+
 			result = StringUtil.replaceXMLEntities(methodName);
 		}
-		
+
 		return result;
 	}
 
@@ -874,11 +892,11 @@ public static IMetaMember lookupMember(String methodId, IParseDictionary parseDi
 		IMetaMember result = null;
 
 		Tag methodTag = parseDictionary.getMethod(methodId);
-		
+
 		if (methodTag != null)
 		{
 			String methodName = methodTag.getAttribute(ATTR_NAME);
-			
+
 			methodName = StringUtil.replaceXMLEntities(methodName);
 
 			String klassId = methodTag.getAttribute(ATTR_HOLDER);
@@ -896,7 +914,7 @@ public static IMetaMember lookupMember(String methodId, IParseDictionary parseDi
 			PackageManager pm = model.getPackageManager();
 
 			MetaClass metaClass = pm.getMetaClass(metaClassName);
-			
+
 			if (metaClass == null)
 			{
 				if (DEBUG_LOGGING)
@@ -932,10 +950,10 @@ public static IMetaMember lookupMember(String methodId, IParseDictionary parseDi
 			}
 
 			if (metaClass != null)
-			{			
+			{
 				MemberSignatureParts msp = MemberSignatureParts.fromParts(metaClass.getFullyQualifiedName(), methodName,
 						returnType, argumentTypes);
-								
+
 				result = metaClass.getMemberForSignature(msp);
 			}
 			else if (!possibleLambdaMethod(metaClassName))
@@ -966,7 +984,7 @@ public static boolean possibleLambdaMethod(String fqClassName)
 			return false;
 		}
 	}
-	
+
 	public static String lookupType(String typeOrKlassID, IParseDictionary parseDictionary)
 	{
 		String result = null;
@@ -974,7 +992,7 @@ public static String lookupType(String typeOrKlassID, IParseDictionary parseDict
 		if (typeOrKlassID != null)
 		{
 			Tag typeTag = parseDictionary.getType(typeOrKlassID);
-			
+
 			if (typeTag == null)
 			{
 				typeTag = parseDictionary.getKlass(typeOrKlassID);
diff --git a/src/main/resources/examples/DeoptTest.java b/src/main/resources/examples/DeoptTest.java
new file mode 100644
index 00000000..3a6cfb78
--- /dev/null
+++ b/src/main/resources/examples/DeoptTest.java
@@ -0,0 +1,49 @@
+public class DeoptTest
+{
+    private long greater = 0;
+    private long less = 0;
+
+    private static final long START = 1_000_000;
+    private static final long END = -1_000_000;
+
+    public Deopt2()
+    {
+        long current = START;
+
+        while (current > END)
+        {
+            checkZero(current);
+
+            current--;
+        }
+
+        System.out.println(greater + " > 0, " + less + " < 0.");
+    }
+
+    private void checkZero(long value)
+    {
+        if (value > 0)
+        {
+            greater();
+        }
+        else
+        {
+            less();
+        }
+    }
+
+    public void greater()
+    {
+        greater++;
+    }
+
+    public void less()
+    {
+        less++;
+    }
+
+    public static void main(String[] args)
+    {
+        new DeoptTest();
+    }
+}