Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

6670: Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View #38

Closed
wants to merge 17 commits into from
Closed

6670: Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View #38

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
60a1b66
6670: Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View
mirage22 Jan 17, 2020
44d3e52
6670: Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View
mirage22 Jan 18, 2020
4d66678
6670: Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View
mirage22 Jan 19, 2020
16ae867
Merge branch 'master' into feature/6670_Harmonize_Unclassifiable_acro…
mirage22 Jan 19, 2020
0f529ec
6670: Harmonize ~ Unclassifiable ~ across Flame View and Stacktrace View
mirage22 Jan 19, 2020
f47bf34
6670: clean up, value comparison strategy
mirage22 Jan 20, 2020
e501ab2
6670: stactrace message, helper methods
mirage22 Jan 20, 2020
7309585
Merge branch 'master' into feature/6670_Harmonize_Unclassifiable_acro…
mirage22 Jan 20, 2020
8c4a0f6
6670: stactrace message eval
mirage22 Jan 20, 2020
a5cfb5e
6670: js cleanup
mirage22 Jan 20, 2020
d641089
6670: cleanup
mirage22 Jan 20, 2020
521d170
6670: cleanup
mirage22 Jan 20, 2020
910a015
6670: partial commit
mirage22 Jan 21, 2020
9a5d526
6670: message bundle correction
mirage22 Jan 22, 2020
3f9ec08
6670: cleanup
mirage22 Jan 22, 2020
fac00a6
6670: spotless correction
mirage22 Jan 22, 2020
fc80b57
6670: messages package correction
mirage22 Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 26 additions & 17 deletions ...flameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/tree/TraceTreeUtils.java
View file
Open in desktop
Expand Up @@ -34,6 +34,7 @@
package org.openjdk.jmc.flightrecorder.flameview.tree;

import org.openjdk.jmc.common.IMCFrame;

import org.openjdk.jmc.common.IMCMethod;
import org.openjdk.jmc.common.item.IItemCollection;
import org.openjdk.jmc.common.util.FormatToolkit;
Expand All @@ -43,12 +44,34 @@
import org.openjdk.jmc.flightrecorder.stacktrace.StacktraceModel.Fork;
import org.openjdk.jmc.flightrecorder.stacktrace.FrameSeparator.FrameCategorization;
import org.openjdk.jmc.flightrecorder.stacktrace.StacktraceFrame;
import org.openjdk.jmc.flightrecorder.stacktrace.messages.internal.Messages;
mirage22 marked this conversation as resolved.
Show resolved Hide resolved

public class TraceTreeUtils {
public final static String DEFAULT_ROOT_NAME = "__root";
public final static String DEFAULT_ROOT_PACKAGE_NAME = "";
public final static FrameSeparator DEFAULT_FRAME_SEPARATOR = new FrameSeparator(FrameCategorization.METHOD, false);

private static class TraceNodeFactory {

private static TraceNode getRootTraceNode(String rootName, Fork rootFork) {
mirage22 marked this conversation as resolved.
Show resolved Hide resolved
return new TraceNode(rootName == null ? DEFAULT_ROOT_NAME : rootName, rootFork.getItemsInFork(),
DEFAULT_ROOT_PACKAGE_NAME);
}

private static TraceNode getTraceNodeByStacktraceFrame(StacktraceFrame sFrame) {
IMCFrame frame = sFrame.getFrame();
IMCMethod method = frame.getMethod();
String packageName = FormatToolkit.getPackage(method.getType().getPackage());
if (frame == StacktraceModel.UNKNOWN_FRAME) {
return new TraceNode(Messages.getString(Messages.STACKTRACE_UNCLASSIFIABLE_FRAME),
sFrame.getItemCount(), packageName);
} else {
String name = FormatToolkit.getHumanReadable(method, false, false, true, false, true, false);
return new TraceNode(name, sFrame.getItemCount(), packageName);
}
}
}

/**
* Traces a TraceTree from a {@link StacktraceModel}.
*
Expand All @@ -58,8 +81,7 @@ public class TraceTreeUtils {
*/
public static TraceNode createTree(StacktraceModel model, String rootName) {
Fork rootFork = model.getRootFork();
TraceNode root = new TraceNode(rootName == null ? DEFAULT_ROOT_NAME : rootName, rootFork.getItemsInFork(),
DEFAULT_ROOT_PACKAGE_NAME);
TraceNode root = TraceNodeFactory.getRootTraceNode(rootName, rootFork);
for (Branch branch : rootFork.getBranches()) {
addBranch(root, branch);
}
Expand All @@ -80,11 +102,10 @@ public static TraceNode createTree(

private static void addBranch(TraceNode root, Branch branch) {
StacktraceFrame firstFrame = branch.getFirstFrame();
TraceNode currentNode = new TraceNode(format(firstFrame), firstFrame.getItemCount(),
formatPackageName(firstFrame));
TraceNode currentNode = TraceNodeFactory.getTraceNodeByStacktraceFrame(firstFrame);
root.addChild(currentNode);
for (StacktraceFrame frame : branch.getTailFrames()) {
TraceNode newNode = new TraceNode(format(frame), frame.getItemCount(), formatPackageName(frame));
TraceNode newNode = TraceNodeFactory.getTraceNodeByStacktraceFrame(frame);
currentNode.addChild(newNode);
currentNode = newNode;
}
Expand All @@ -97,18 +118,6 @@ private static void addFork(TraceNode node, Fork fork) {
}
}

private static String format(StacktraceFrame sFrame) {
IMCFrame frame = sFrame.getFrame();
IMCMethod method = frame.getMethod();
return FormatToolkit.getHumanReadable(method, false, false, true, false, true, false);
}

private static String formatPackageName(StacktraceFrame sFrame) {
IMCFrame frame = sFrame.getFrame();
IMCMethod method = frame.getMethod();
return FormatToolkit.getPackage(method.getType().getPackage());
}

public static String printTree(TraceNode node) {
StringBuilder builder = new StringBuilder();
builder.append("=== Tree Printout ===");
Expand Down
18 changes: 16 additions & 2 deletions ...lameview/src/main/java/org/openjdk/jmc/flightrecorder/flameview/views/FlameGraphView.java
View file
Open in desktop
Expand Up @@ -77,6 +77,9 @@
import org.openjdk.jmc.ui.handlers.MCContextMenuManager;
import org.openjdk.jmc.ui.misc.DisplayToolkit;

import static org.openjdk.jmc.flightrecorder.ui.messages.internal.Messages.Flameview_UNCLASSIFIABLE_FRAME_DESC;
import static org.openjdk.jmc.flightrecorder.stacktrace.messages.internal.Messages.STACKTRACE_UNCLASSIFIABLE_FRAME;
mirage22 marked this conversation as resolved.
Show resolved Hide resolved

public class FlameGraphView extends ViewPart implements ISelectionListener {
private static final String HTML_PAGE;
static {
Expand Down Expand Up @@ -253,8 +256,8 @@ private static String render(TraceNode root) {
}

private static void render(StringBuilder builder, TraceNode node) {
String start = String.format("{%s,%s,%s, \"c\": [ ", toJSonKeyValue("n", node.getName()),
toJSonKeyValue("p", node.getPackageName()), toJSonKeyValue("v", String.valueOf(node.getValue())));
String start = STACKTRACE_UNCLASSIFIABLE_FRAME.equals(node.getName()) ? createJsonTraceNode(node)
: createJsonDescTraceNode(node);
builder.append(start);
for (int i = 0; i < node.getChildren().size(); i++) {
render(builder, node.getChildren().get(i));
Expand All @@ -265,6 +268,17 @@ private static void render(StringBuilder builder, TraceNode node) {
builder.append("]}");
}

private static String createJsonTraceNode(TraceNode node) {
return String.format("{%s,%s,%s, \"c\": [ ", toJSonKeyValue("n", node.getName()),
toJSonKeyValue("p", node.getPackageName()), toJSonKeyValue("v", String.valueOf(node.getValue())));
}

private static String createJsonDescTraceNode(TraceNode node) {
return String.format("{%s,%s,%s,%s, \"c\": [ ", toJSonKeyValue("n", node.getName()),
toJSonKeyValue("p", node.getPackageName()), toJSonKeyValue("d", Flameview_UNCLASSIFIABLE_FRAME_DESC),
toJSonKeyValue("v", String.valueOf(node.getValue())));
}

private static String toJSonKeyValue(String key, String value) {
return "\"" + key + "\": " + "\"" + value + "\"";
}
Expand Down
10 changes: 9 additions & 1 deletion ...rg.openjdk.jmc.flightrecorder.flameview/src/main/resources/jsjmclibs/flameviewColoring.js
View file
Open in desktop
Expand Up @@ -43,6 +43,7 @@ String.prototype.hashCode = function () {
return hash;
};

const htmlTagBr = "\u003Cbr\u002F\u003E";
const rootPackageColor = "darkred";
const invalidPackageColor = "snow";
const packageJavaColorLightGray = "lightgray";
Expand Down Expand Up @@ -120,5 +121,12 @@ const colorCell = function (d) {
};

const adjustTip = function (d) {
return d.data.n + "\u003Cbr\u002F\u003Epackage: " + d.data.p + "\u003Cbr\u002F\u003Esamples: " + d.data.v;
var tipMessage = d.data.n + htmlTagBr;
if( d.data.d !== undefined) {
tipMessage += "description: " + d.data.d + htmlTagBr;
} else {
tipMessage += "package: " + d.data.p + htmlTagBr;
}
tipMessage += "samples: " + d.data.v;
return tipMessage;
};
1 change: 1 addition & 0 deletions ...corder.ui/src/main/java/org/openjdk/jmc/flightrecorder/ui/messages/internal/Messages.java
View file
Open in desktop
Expand Up @@ -523,6 +523,7 @@ public class Messages extends NLS {
public static String VMOperationPage_PAGE_NAME;
public static String VMOperationPage_ROW_VM_OPERATIONS;
public static String VMOperationPage_TIMELINE_SELECTION;
public static String Flameview_UNCLASSIFIABLE_FRAME_DESC;
mirage22 marked this conversation as resolved.
Show resolved Hide resolved

static {
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Expand Down
1 change: 1 addition & 0 deletions ...rc/main/resources/org/openjdk/jmc/flightrecorder/ui/messages/internal/messages.properties
View file
Open in desktop
Expand Up @@ -612,3 +612,4 @@ MemoryLeakPage_STEPS_SKIPPED={0} {1} skipped steps from parent
MethodProfilingPage_CLASS_HISTOGRAM_SELECTION=Method Profiling Class Histogram Selection
MethodProfilingPage_PACKAGE_HISTOGRAM_SELECTION=Method Profiling Package Histogram Selection
MethodProfilingPage_PAGE_NAME=Method Profiling
Flameview_UNCLASSIFIABLE_FRAME_DESC=Unclassified means the stacktrace reached the stackdepth limit
1 change: 1 addition & 0 deletions core/org.openjdk.jmc.flightrecorder/META-INF/MANIFEST.MF
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@ Export-Package: org.openjdk.jmc.flightrecorder,
org.openjdk.jmc.flightrecorder.parser,
org.openjdk.jmc.flightrecorder.parser.filter,
org.openjdk.jmc.flightrecorder.stacktrace,
org.openjdk.jmc.flightrecorder.stacktrace.messages.internal,
org.openjdk.jmc.flightrecorder.util
Require-Bundle: org.openjdk.jmc.common;visibility:=reexport
Eclipse-BuddyPolicy: app
Expand Down