Showing stack trace of the selected event in JFR Browser

jisedlac · jisedlac · commit 12d7f6291356 · 2020-04-06T17:06:11.000+02:00
- introduced JFREvent.getID()
 - introduced JFRModel.getEvent(id)
 - introduced JFRMethod.getDescription()
 - introduced JFRStackTrace.isTruncated()
 - improved performance &amp; memory of the JFR Browser
diff --git a/visualvm/jfr.generic/manifest.mf b/visualvm/jfr.generic/manifest.mf
@@ -4,5 +4,5 @@ AutoUpdate-Essential-Module: true
 OpenIDE-Module: org.graalvm.visualvm.jfr.generic/2
 OpenIDE-Module-Install: org/graalvm/visualvm/jfr/generic/Installer.class
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/jfr/generic/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.0
+OpenIDE-Module-Specification-Version: 2.1
 OpenIDE-Module-Provides: jfr.implementation
diff --git a/visualvm/jfr.generic/nbproject/project.xml b/visualvm/jfr.generic/nbproject/project.xml
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericEvent.java b/visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,8 @@ abstract class JFRGenericEvent extends JFREvent {
     final IItem item;
     
     
-    protected JFRGenericEvent(IItem event) {
+    protected JFRGenericEvent(IItem event, long id) {
+        super(id);
         this.item = event;
     }
     
@@ -289,8 +290,8 @@ public String toString() {
     // JFREvent for .jfr v0 (JDK 7 & 8)
     static final class V0 extends JFRGenericEvent {
         
-        V0(IItem event) {
-            super(event);
+        V0(IItem event, long id) {
+            super(event, id);
         }
 
         @Override
@@ -327,8 +328,8 @@ protected Object getThreadThread() throws JFRPropertyNotAvailableException {
     // JFREvent for .jfr v1 and v2 (JDK 9+)
     static final class V1 extends JFRGenericEvent {
         
-        V1(IItem event) {
-            super(event);
+        V1(IItem event, long id) {
+            super(event, id);
         }
 
         @Override
diff --git a/visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericEventFactory.java b/visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericEventFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@
  */
 abstract class JFRGenericEventFactory {
     
-    abstract JFRGenericEvent createEvent(IItem item);
+    abstract JFRGenericEvent createEvent(IItem item, long id);
     
     
     static JFRGenericEventFactory resolve(EventArray[] types) {
@@ -51,13 +51,13 @@ static JFRGenericEventFactory resolve(EventArray[] types) {
     
     static class V0 extends JFRGenericEventFactory {
 
-        @Override JFRGenericEvent createEvent(IItem item) { return new JFRGenericEvent.V0(item); }
+        @Override JFRGenericEvent createEvent(IItem item, long id) { return new JFRGenericEvent.V0(item, id); }
         
     }
     
     static class V1 extends JFRGenericEventFactory {
 
-        @Override JFRGenericEvent createEvent(IItem item) { return new JFRGenericEvent.V1(item); }
+        @Override JFRGenericEvent createEvent(IItem item, long id) { return new JFRGenericEvent.V1(item, id); }
         
     }
     
diff --git a/visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericMethod.java b/visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,11 @@ final class JFRGenericMethod extends JFRMethod {
     public String getName() {
         return method.getMethodName();
     }
+    
+    @Override
+    public String getDescriptor() {
+        return method.getFormalDescriptor();
+    }
 
     @Override
     public JFRClass getType() {
diff --git a/visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericModel.java b/visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,12 +79,13 @@ public void visitEvents(JFREventVisitor... visitors) {
         try {
             List<JFREventVisitor> _visitors = new ArrayList(Arrays.asList(visitors));
             Iterator<EventArray> iterables = Arrays.asList(types).iterator();
+            long id = 0;
             while (!_visitors.isEmpty() && iterables.hasNext()) {
                 EventArray type = iterables.next();
                 String typeId = type.getType().getIdentifier();
                 Iterator<IItem> items = Arrays.asList(type.getEvents()).iterator();
                 while (!_visitors.isEmpty() && items.hasNext()) {
-                    JFREvent event = factory.createEvent(items.next());
+                    JFREvent event = factory.createEvent(items.next(), id++);
                     Iterator<JFREventVisitor> _visitorsI = _visitors.iterator();
                     while (_visitorsI.hasNext())
                         if (_visitorsI.next().visit(typeId, event))
diff --git a/visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericStackTrace.java b/visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericStackTrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,11 @@ public List<JFRStackFrame> getFrames() {
         return frames;
     }
     
+    @Override
+    public boolean isTruncated() {
+        return stackTrace.getTruncationState().isTruncated();
+    }
+    
     
     @Override
     public int hashCode() {
diff --git a/visualvm/jfr.jdk11/manifest.mf b/visualvm/jfr.jdk11/manifest.mf
@@ -4,5 +4,5 @@ OpenIDE-Module: org.graalvm.visualvm.jfr.jdk11/2
 OpenIDE-Module-Install: org/graalvm/visualvm/jfr/jdk11/Installer.class
 OpenIDE-Module-Java-Dependencies: Java > 11
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/jfr/jdk11/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.0
+OpenIDE-Module-Specification-Version: 2.1
 OpenIDE-Module-Provides: jfr.implementation
diff --git a/visualvm/jfr.jdk11/nbproject/project.xml b/visualvm/jfr.jdk11/nbproject/project.xml
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -30,7 +30,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/Bundle.properties b/visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/Bundle.properties
@@ -25,7 +25,6 @@
 OpenIDE-Module-Display-Category=JFR Loaders
 OpenIDE-Module-Long-Description=\
     Support for the JFR loader bundled with JDK 11 and newer (requires running VisualVM on JDK 11+) reading JFR snapshots created from JDK 9 and newer. \
-    Requires VisualVM-JFR-JDK9 to be installed as well.\n\
-    <BR>\n<BR>\nIf you run VisualVM on JDK 9 or JDK 10, please install only the <B>VisualVM-JFR-JDK9</B> loader support.
+    Requires VisualVM-JFR-JDK9 to be installed as well.
 OpenIDE-Module-Name=VisualVM-JFR-JDK11
 OpenIDE-Module-Short-Description=Support for the JFR loader bundled with JDK 11 and newer reading JFR snapshots created from JDK 11 and newer
diff --git a/visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/model/impl/JFRJDK11Event.java b/visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/model/impl/JFRJDK11Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,8 @@
  */
 final class JFRJDK11Event extends JFRJDK9Event {    
     
-    JFRJDK11Event(RecordedEvent event) {
-        super(event);
+    JFRJDK11Event(RecordedEvent event, long id) {
+        super(event, id);
     }
 
     
diff --git a/visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/model/impl/JFRJDK11Model.java b/visualvm/jfr.jdk11/src/org/graalvm/visualvm/jfr/jdk11/model/impl/JFRJDK11Model.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,8 +57,8 @@ protected String getTypeId(EventType eventType) {
     }
     
     @Override
-    protected JFREvent createEvent(RecordedEvent revent) {
-        return new JFRJDK11Event(revent);
+    protected JFREvent createEvent(RecordedEvent revent, long id) {
+        return new JFRJDK11Event(revent, id);
     }
     
 }
diff --git a/visualvm/jfr.jdk9/manifest.mf b/visualvm/jfr.jdk9/manifest.mf
@@ -4,5 +4,5 @@ OpenIDE-Module: org.graalvm.visualvm.jfr.jdk9/2
 OpenIDE-Module-Install: org/graalvm/visualvm/jfr/jdk9/Installer.class
 OpenIDE-Module-Java-Dependencies: Java > 1.9
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/jfr/jdk9/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.0
+OpenIDE-Module-Specification-Version: 2.1
 OpenIDE-Module-Provides: jfr.implementation
diff --git a/visualvm/jfr.jdk9/nbproject/project.xml b/visualvm/jfr.jdk9/nbproject/project.xml
@@ -21,7 +21,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>2.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/Bundle.properties b/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/Bundle.properties
@@ -24,7 +24,6 @@
 
 OpenIDE-Module-Display-Category=JFR Loaders
 OpenIDE-Module-Long-Description=\
-    Support for the JFR loader bundled with JDK 9 and JDK 10 (requires running VisualVM on JDK 9/10) reading JFR snapshots created from JDK 9 and JDK 10.\n\
-    <BR>\n<BR>\nIf you run VisualVM on JDK 11 and newer, please install also the <B>VisualVM-JFR-JDK11</B> loader support.
+    Support for the JFR loader bundled with JDK 9 and JDK 10 (requires running VisualVM on JDK 9/10) reading JFR snapshots created from JDK 9 and JDK 10.
 OpenIDE-Module-Name=VisualVM-JFR-JDK9
 OpenIDE-Module-Short-Description=Support for the JFR loader bundled with JDK 9 and JDK 10 reading JFR snapshots created from JDK 9 and JDK 10
diff --git a/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/JFRJDK9Event.java b/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/JFRJDK9Event.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,8 @@ public class JFRJDK9Event extends JFREvent {
     protected final RecordedEvent event;
     
     
-    public JFRJDK9Event(RecordedEvent event) {
+    public JFRJDK9Event(RecordedEvent event, long id) {
+        super(id);
         this.event = event;
     }
     
diff --git a/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/JFRJDK9Method.java b/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/JFRJDK9Method.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,6 +47,11 @@ final class JFRJDK9Method extends JFRMethod {
     public String getName() {
         return method.getName();
     }
+    
+    @Override
+    public String getDescriptor() {
+        return method.getDescriptor();
+    }
 
     @Override
     public JFRClass getType() {
diff --git a/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/JFRJDK9Model.java b/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/JFRJDK9Model.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -76,10 +76,11 @@ public void visitEvents(JFREventVisitor... visitors) {
         // Notify visitors that are not done 'visit'
         try (RecordingFile events = new RecordingFile(snapshotFile.toPath())) {
             List<JFREventVisitor> _visitors = new ArrayList(Arrays.asList(visitors));
+            long id = 0;
             while (!_visitors.isEmpty() && events.hasMoreEvents()) {
                 RecordedEvent revent = events.readEvent();
                 String typeId = getTypeId(revent.getEventType());
-                JFREvent event = createEvent(revent);
+                JFREvent event = createEvent(revent, id++);
                 Iterator<JFREventVisitor> _visitorsI = _visitors.iterator();
                 while (_visitorsI.hasNext())
                     if (_visitorsI.next().visit(typeId, event))
@@ -134,8 +135,8 @@ protected static String normalizeV1Id(String typeId) {
     }
     
     
-    protected JFREvent createEvent(RecordedEvent revent) {
-        return new JFRJDK9Event(revent);
+    protected JFREvent createEvent(RecordedEvent revent, long id) {
+        return new JFRJDK9Event(revent, id);
     }
     
 }
diff --git a/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/JFRJDK9StackTrace.java b/visualvm/jfr.jdk9/src/org/graalvm/visualvm/jfr/jdk9/model/impl/JFRJDK9StackTrace.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,6 +56,11 @@ public List<JFRStackFrame> getFrames() {
         return frames;
     }
     
+    @Override
+    public boolean isTruncated() {
+        return stackTrace.isTruncated();
+    }
+    
     
     @Override
     public int hashCode() {
diff --git a/visualvm/jfr/manifest.mf b/visualvm/jfr/manifest.mf
@@ -5,5 +5,5 @@ OpenIDE-Module: org.graalvm.visualvm.jfr/2
 OpenIDE-Module-Layer: org/graalvm/visualvm/jfr/resources/layer.xml
 OpenIDE-Module-Install: org/graalvm/visualvm/jfr/Installer.class
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/jfr/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.0
+OpenIDE-Module-Specification-Version: 2.1
 OpenIDE-Module-Recommends: jfr.implementation
diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/model/JFREvent.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/model/JFREvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,19 @@
  */
 public abstract class JFREvent {
     
+    private final long id;
+    
+    
+    protected JFREvent(long id) {
+        this.id = id;
+    }
+    
+    
+    public final long getID() {
+        return id;
+    }
+    
+    
     public boolean getBoolean(String key) throws JFRPropertyNotAvailableException {
         Object value = getValue(key);
         if (value instanceof Boolean) return (Boolean)value;
diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/model/JFRMethod.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/model/JFRMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,8 @@ public abstract class JFRMethod {
     
     public abstract String getName();
     
+    public abstract String getDescriptor();
+    
     public abstract JFRClass getType();
     
 }
diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/model/JFRModel.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/model/JFRModel.java
diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/model/JFRStackTrace.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/model/JFRStackTrace.java
diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/browser/BrowserViewSupport.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/browser/BrowserViewSupport.java
diff --git a/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/browser/JFRSnapshotBrowserView.java b/visualvm/jfr/src/org/graalvm/visualvm/jfr/views/browser/JFRSnapshotBrowserView.java
