Added snapshot to codecache view, repackaged lock optimisation reports

core/src/main/java/org/adoptopenjdk/jitwatch/report/escapeanalysis/lockelision/ElidedLocksWalker.java → core/src/main/java/org/adoptopenjdk/jitwatch/report/locks/OptimisedLocksWalker.java

@@ -3,16 +3,16 @@
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
-package org.adoptopenjdk.jitwatch.report.escapeanalysis.lockelision;
+package org.adoptopenjdk.jitwatch.report.locks;
 
 import org.adoptopenjdk.jitwatch.model.IReadOnlyJITDataModel;
 import org.adoptopenjdk.jitwatch.model.bytecode.BCAnnotationType;
 import org.adoptopenjdk.jitwatch.model.bytecode.LineAnnotation;
 import org.adoptopenjdk.jitwatch.report.escapeanalysis.AbstractEscapeAnalysisWalker;
 
-public class ElidedLocksWalker extends AbstractEscapeAnalysisWalker
+public class OptimisedLocksWalker extends AbstractEscapeAnalysisWalker
 {
-	public ElidedLocksWalker(IReadOnlyJITDataModel model)
+	public OptimisedLocksWalker(IReadOnlyJITDataModel model)
 	{
 		super(model);
 	}

ui/src/main/java/org/adoptopenjdk/jitwatch/ui/codecache/CodeCacheLayoutStage.java

@@ -36,6 +36,8 @@
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Polygon;
@@ -73,7 +75,7 @@ public class CodeCacheLayoutStage extends Stage implements IRedrawable, ICompila
 	private Button btnZoomOut;
 	private Button btnZoomReset;
 	private Button btnAnimate;
-
+	
 	private CheckBox checkC1;
 	private CheckBox checkC2;
 
@@ -113,14 +115,14 @@ public CodeCacheLayoutStage(final JITWatchUI parent)
 
 		borderPane.setTop(scrollPane);
 
-		VBox vBoxControls = buildControls();
+		Scene scene = UserInterfaceUtil.getScene(borderPane, JITWatchUI.WINDOW_WIDTH, JITWatchUI.WINDOW_HEIGHT);
+
+		VBox vBoxControls = buildControls(scene);
 
 		borderPane.setCenter(vBoxControls);
 
 		borderPane.setBottom(nMethodInfo);
-
-		Scene scene = UserInterfaceUtil.getScene(borderPane, JITWatchUI.WINDOW_WIDTH, JITWatchUI.WINDOW_HEIGHT);
-
+
 		scrollPane.prefWidthProperty().bind(scene.widthProperty());
 		scrollPane.prefHeightProperty().bind(scene.heightProperty().multiply(0.5));
 
@@ -142,22 +144,22 @@ public CodeCacheLayoutStage(final JITWatchUI parent)
 		setScene(scene);
 	}
 
-	private VBox buildControls()
+	private VBox buildControls(Scene scene)
 	{
 		VBox vBoxControls = new VBox();
 
-		vBoxControls.getChildren().addAll(buildControlButtons(), buildControlInfo());
+		vBoxControls.getChildren().addAll(buildControlButtons(scene), buildControlInfo());
 
 		return vBoxControls;
 	}
 
-	private HBox buildControlButtons()
+	private HBox buildControlButtons(Scene scene)
 	{
 		HBox hboxControls = new HBox();
 
 		hboxControls.setSpacing(10);
 		hboxControls.setAlignment(Pos.CENTER_LEFT);
-		hboxControls.setPadding(new Insets(4, 0, 0, 8));
+		hboxControls.setPadding(new Insets(4, 4, 0, 8));
 
 		btnZoomIn = new Button("Zoom In");
 		btnZoomOut = new Button("Zoom Out");
@@ -244,7 +246,12 @@ public void handle(ActionEvent e)
 			}
 		});
 
-		hboxControls.getChildren().addAll(checkC1, checkC2, btnZoomIn, btnZoomOut, btnZoomReset, btnAnimate, txtAnimationSeconds);
+		Region spacerStatus = new Region();
+		HBox.setHgrow(spacerStatus, Priority.ALWAYS);
+
+		Button buttonSnapShot = UserInterfaceUtil.getSnapshotButton(scene, "CodeCache");
+
+		hboxControls.getChildren().addAll(checkC1, checkC2, btnZoomIn, btnZoomOut, btnZoomReset, btnAnimate, txtAnimationSeconds, spacerStatus, buttonSnapShot);
 
 		return hboxControls;
 	}

ui/src/main/java/org/adoptopenjdk/jitwatch/ui/compilechain/CompileChainStage.java

@@ -7,6 +7,7 @@
 
 import static org.adoptopenjdk.jitwatch.util.UserInterfaceUtil.fix;
 
+import static org.adoptopenjdk.jitwatch.core.JITWatchConstants.S_EMPTY;
 import org.adoptopenjdk.jitwatch.chain.CompileChainWalker;
 import org.adoptopenjdk.jitwatch.chain.CompileNode;
 import org.adoptopenjdk.jitwatch.model.Compilation;
@@ -22,8 +23,10 @@
 import org.adoptopenjdk.jitwatch.util.UserInterfaceUtil;
 
 import javafx.event.EventHandler;
+import javafx.geometry.Insets;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
+import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseEvent;
@@ -45,6 +48,9 @@ public class CompileChainStage extends Stage implements ICompilationChangeListen
 	private ScrollPane scrollPane;
 	private Pane pane;
 	private IStageAccessProxy stageAccess;
+
+	private Label labelRootNodeMember;
+
 	private CompilationChooser compilationChooser;
 
 	private CompileNode rootNode;
@@ -96,13 +102,18 @@ public CompileChainStage(IMemberSelectedListener selectionListener, final IStage
 
 		HBox hBox = new HBox();
 
+		labelRootNodeMember = new Label();
+
+		hBox.getChildren().add(labelRootNodeMember);
 		hBox.getChildren().add(compilationChooser.getCombo());
 		hBox.getChildren().add(spacer);
 		hBox.getChildren().add(buttonSnapShot);
 
+		hBox.setSpacing(16.0);
+		hBox.setPadding(new Insets(4, 4, 4, 4));
+
 		verticalLayout.getChildren().addAll(hBox, scrollPane);
 
-
 		RateLimitedResizeListener resizeListener = new RateLimitedResizeListener(this, 200);
 
 		pane.widthProperty().addListener(resizeListener);
@@ -350,14 +361,20 @@ private void buildTree(IMetaMember member)
 
 			this.rootNode = root;
 
-			title += root.getMemberName() + " " + root.getCompilation().getSignature();
+			String rootMemberName = getLabelText(root);
+
+			title += rootMemberName + " " + root.getCompilation().getSignature();
 
 			setTitle(title);
+
+			labelRootNodeMember.setText(rootMemberName);
 		}
 		else
 		{
 			rootNode = null;
 
+			labelRootNodeMember.setText(S_EMPTY);
+
 			clear();
 
 			Text text = new Text(member.toString() + " was not JIT compiled");

ui/src/main/java/org/adoptopenjdk/jitwatch/ui/main/JITWatchUI.java

@@ -39,8 +39,8 @@
 import org.adoptopenjdk.jitwatch.report.Report;
 import org.adoptopenjdk.jitwatch.report.comparator.ScoreComparator;
 import org.adoptopenjdk.jitwatch.report.escapeanalysis.eliminatedallocation.EliminatedAllocationWalker;
-import org.adoptopenjdk.jitwatch.report.escapeanalysis.lockelision.ElidedLocksWalker;
 import org.adoptopenjdk.jitwatch.report.inlining.InliningWalker;
+import org.adoptopenjdk.jitwatch.report.locks.OptimisedLocksWalker;
 import org.adoptopenjdk.jitwatch.report.suggestion.SuggestionWalker;
 import org.adoptopenjdk.jitwatch.ui.Dialogs;
 import org.adoptopenjdk.jitwatch.ui.browser.BrowserStage;
@@ -163,7 +163,7 @@ public class JITWatchUI extends Application
 	private Button btnTriView;
 	private Button btnReportSuggestions;
 	private Button btnReportEliminatedAllocations;
-	private Button btnReportElidedLocks;
+	private Button btnReportOptimisedLocks;
 	private Button btnSandbox;
 
 	private Label lblHeap;
@@ -180,7 +180,7 @@ public class JITWatchUI extends Application
 
 	private ReportStage reportStageSuggestions;
 	private ReportStage reportStageElminatedAllocations;
-	private ReportStage reportStageElidedLocks;
+	private ReportStage reportStageOptimisedLocks;
 
 	private SandboxStage sandBoxStage;
 
@@ -191,7 +191,7 @@ public class JITWatchUI extends Application
 
 	private List<Report> reportListSuggestions = new ArrayList<>();
 	private List<Report> reportListEliminatedAllocations = new ArrayList<>();
-	private List<Report> reportListElidedLocks = new ArrayList<>();
+	private List<Report> reportListOptimisedLocks = new ArrayList<>();
 
 	private CodeCacheWalkerResult codeCacheWalkerResult;
 
@@ -271,7 +271,7 @@ private void clear()
 
 		reportListSuggestions.clear();
 		reportListEliminatedAllocations.clear();
-		reportListElidedLocks.clear();
+		reportListOptimisedLocks.clear();
 
 		Platform.runLater(new Runnable()
 		{
@@ -312,7 +312,7 @@ public void handleReadComplete()
 
 		buildEliminatedAllocationReport();
 
-		buildElidedLocksReport();
+		buildOptimisedLocksReport();
 
 		Platform.runLater(new Runnable()
 		{
@@ -350,15 +350,15 @@ private void buildEliminatedAllocationReport()
 		log("Found " + reportListEliminatedAllocations.size() + "  eliminated allocations.");
 	}
 
-	private void buildElidedLocksReport()
+	private void buildOptimisedLocksReport()
 	{
-		log("Finding elided locks");
+		log("Finding optimised locks");
 
-		ElidedLocksWalker walker = new ElidedLocksWalker(logParser.getModel());
+		OptimisedLocksWalker walker = new OptimisedLocksWalker(logParser.getModel());
 
-		reportListElidedLocks = walker.getReports(new ScoreComparator());
+		reportListOptimisedLocks = walker.getReports(new ScoreComparator());
 
-		log("Found " + reportListElidedLocks.size() + " elided locks.");
+		log("Found " + reportListOptimisedLocks.size() + " optimised locks.");
 	}
 
 	private CodeCacheWalkerResult buildCodeCacheResult()
@@ -618,18 +618,18 @@ public void handle(ActionEvent e)
 			}
 		});
 
-		btnReportElidedLocks = new Button("-Locks");
-		btnReportElidedLocks.setOnAction(new EventHandler<ActionEvent>()
+		btnReportOptimisedLocks = new Button("-Locks");
+		btnReportOptimisedLocks.setOnAction(new EventHandler<ActionEvent>()
 		{
 			@Override
 			public void handle(ActionEvent e)
 			{
-				reportStageElidedLocks = new ReportStage(JITWatchUI.this, "JITWatch Elided Lock Report",
-						ReportStageType.ELIDED_LOCK, reportListElidedLocks);
+				reportStageOptimisedLocks = new ReportStage(JITWatchUI.this, "JITWatch Optimised Lock Report",
+						ReportStageType.ELIDED_LOCK, reportListOptimisedLocks);
 
-				StageManager.addAndShow(JITWatchUI.this.stage, reportStageElidedLocks);
+				StageManager.addAndShow(JITWatchUI.this.stage, reportStageOptimisedLocks);
 
-				btnReportElidedLocks.setDisable(true);
+				btnReportOptimisedLocks.setDisable(true);
 			}
 		});
 
@@ -718,7 +718,7 @@ public void handle(ActionEvent e)
 		hboxTop.getChildren().add(btnTriView);
 		hboxTop.getChildren().add(btnReportSuggestions);
 		hboxTop.getChildren().add(btnReportEliminatedAllocations);
-		hboxTop.getChildren().add(btnReportElidedLocks);
+		hboxTop.getChildren().add(btnReportOptimisedLocks);
 
 		compilationRowList = FXCollections.observableArrayList();
 		compilationTable = CompilationTableBuilder.buildTableMemberAttributes(compilationRowList);
@@ -936,7 +936,7 @@ private void updateButtons()
 
 		btnReportSuggestions.setText("Suggestions (" + reportListSuggestions.size() + S_CLOSE_PARENTHESES);
 		btnReportEliminatedAllocations.setText("-Allocs (" + reportListEliminatedAllocations.size() + S_CLOSE_PARENTHESES);
-		btnReportElidedLocks.setText("-Locks (" + reportListElidedLocks.size() + S_CLOSE_PARENTHESES);
+		btnReportOptimisedLocks.setText("-Locks (" + reportListOptimisedLocks.size() + S_CLOSE_PARENTHESES);
 	}
 
 	public boolean focusTreeOnClass(MetaClass metaClass, boolean unsetSelection)
@@ -1424,8 +1424,8 @@ else if (stage instanceof ReportStage)
 				reportStageElminatedAllocations = null;
 				break;
 			case ELIDED_LOCK:
-				btnReportElidedLocks.setDisable(false);
-				reportStageElidedLocks = null;
+				btnReportOptimisedLocks.setDisable(false);
+				reportStageOptimisedLocks = null;
 				break;
 			case INLINING:
 				break;

ui/src/main/java/org/adoptopenjdk/jitwatch/ui/report/ReportStage.java

@@ -16,12 +16,12 @@
 import org.adoptopenjdk.jitwatch.ui.main.JITWatchUI;
 import org.adoptopenjdk.jitwatch.ui.report.cell.LinkedBCICell;
 import org.adoptopenjdk.jitwatch.ui.report.cell.MemberTableCell;
-import org.adoptopenjdk.jitwatch.ui.report.elidedlock.ElidedLockRowBean;
-import org.adoptopenjdk.jitwatch.ui.report.elidedlock.ElidedLockRowBuilder;
 import org.adoptopenjdk.jitwatch.ui.report.eliminatedallocation.EliminatedAllocationRowBean;
 import org.adoptopenjdk.jitwatch.ui.report.eliminatedallocation.EliminatedAllocationRowBuilder;
 import org.adoptopenjdk.jitwatch.ui.report.inlining.InliningRowBean;
 import org.adoptopenjdk.jitwatch.ui.report.inlining.InliningRowBuilder;
+import org.adoptopenjdk.jitwatch.ui.report.locks.OptimisedLockRowBean;
+import org.adoptopenjdk.jitwatch.ui.report.locks.OptimisedLockRowBuilder;
 import org.adoptopenjdk.jitwatch.ui.report.suggestion.SuggestionRowBean;
 import org.adoptopenjdk.jitwatch.ui.report.suggestion.SuggestionRowBuilder;
 import org.adoptopenjdk.jitwatch.util.UserInterfaceUtil;
@@ -74,19 +74,19 @@ public ReportStage(final IStageAccessProxy proxy, String title, ReportStageType
 		{
 		case SUGGESTION:
 			setTitle(title);
-			tableView = SuggestionRowBuilder.buildTableSuggestion(observableList);
+			tableView = SuggestionRowBuilder.buildTable(observableList);
 			break;
 		case ELIMINATED_ALLOCATION:
 			setTitle(title);
-			tableView = EliminatedAllocationRowBuilder.buildTableSuggestion(observableList);
+			tableView = EliminatedAllocationRowBuilder.buildTable(observableList);
 			break;
 		case ELIDED_LOCK:
 			setTitle(title);
-			tableView = ElidedLockRowBuilder.buildTableSuggestion(observableList);
+			tableView = OptimisedLockRowBuilder.buildTable(observableList);
 			break;
 		case INLINING:
 			setTitle(title);
-			tableView = InliningRowBuilder.buildTableSuggestion(observableList);
+			tableView = InliningRowBuilder.buildTable(observableList);
 			break;
 		}
 
@@ -153,7 +153,7 @@ private void display()
 						observableList.add(new EliminatedAllocationRowBean(report));
 						break;
 					case ELIDED_LOCK:
-						observableList.add(new ElidedLockRowBean(report));
+						observableList.add(new OptimisedLockRowBean(report));
 						break;
 					case INLINING:
 						observableList.add(new InliningRowBean(report));

ui/src/main/java/org/adoptopenjdk/jitwatch/ui/report/eliminatedallocation/EliminatedAllocationRowBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Chris Newland.
+ * Copyright (c) 2013-2017 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -23,7 +23,7 @@ private EliminatedAllocationRowBuilder()
 	{
 	}
 
-	public static TableView<IReportRowBean> buildTableSuggestion(ObservableList<IReportRowBean> rows)
+	public static TableView<IReportRowBean> buildTable(ObservableList<IReportRowBean> rows)
 	{
 		TableView<IReportRowBean> tv = new TableView<>();
 

ui/src/main/java/org/adoptopenjdk/jitwatch/ui/report/inlining/InliningRowBuilder.java

@@ -23,7 +23,7 @@ private InliningRowBuilder()
 	{
 	}
 
-	public static TableView<IReportRowBean> buildTableSuggestion(ObservableList<IReportRowBean> rows)
+	public static TableView<IReportRowBean> buildTable(ObservableList<IReportRowBean> rows)
 	{
 		TableView<IReportRowBean> tv = new TableView<>();