GH-481 new "GC Roots" column added to classes view

thurka · thurka · commit d1dfc987074b · 2023-01-26T13:49:18.000+01:00
diff --git a/visualvm/heapviewer/manifest.mf b/visualvm/heapviewer/manifest.mf
@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
 AutoUpdate-Essential-Module: true
 OpenIDE-Module: org.graalvm.visualvm.heapviewer/2
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/heapviewer/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.7
+OpenIDE-Module-Specification-Version: 2.8
 
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/InstanceNode.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/InstanceNode.java
@@ -83,6 +83,11 @@ public Instance getInstance() {
         return instance;
     }
     
+    public int getGCRoots() {
+        Heap heap = instance.getJavaClass().getHeap();
+        return heap.getGCRoots(instance).size();
+    }
+
     public JavaClass getJavaClass() {
         return instance.getJavaClass();
     }
@@ -173,6 +178,7 @@ protected Object getValue(DataType type, Heap heap) {
         if (type == DataType.CLASS) return getJavaClass();
         
         if (type == DataType.LOGICAL_VALUE) return getLogicalValue();
+        if (type == DataType.GCROOTS) return getGCRoots();
         
         if (type == DataType.OBJECT_ID) {
             Instance i = getInstance();
@@ -214,6 +220,11 @@ public String getName() {
             else return super.getName();
         }
 
+        public int getGCRoots() {
+            if (getInstance() == null) return DataType.GCROOTS.getNoValue();
+            else return super.getGCRoots();
+        }
+
         public String getLogicalValue() {
             if (getInstance() == null) return DataType.LOGICAL_VALUE.getNoValue();
             else return super.getLogicalValue();
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/GCTypeNode.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/GCTypeNode.java
@@ -26,9 +26,15 @@
 package org.graalvm.visualvm.heapviewer.java.impl;
 
 import java.awt.Font;
+import java.util.HashMap;
+import java.util.Map;
+import org.graalvm.visualvm.heapviewer.java.InstanceNode;
 import org.graalvm.visualvm.heapviewer.java.InstancesContainer;
 import org.graalvm.visualvm.heapviewer.model.DataType;
 import org.graalvm.visualvm.heapviewer.ui.HeapViewerRenderer;
+import org.graalvm.visualvm.lib.jfluid.heap.GCRoot;
+import org.graalvm.visualvm.lib.jfluid.heap.Heap;
+import org.graalvm.visualvm.lib.jfluid.heap.Instance;
 import org.graalvm.visualvm.lib.profiler.api.icons.Icons;
 import org.graalvm.visualvm.lib.profiler.api.icons.ProfilerIcons;
 import org.graalvm.visualvm.lib.ui.swing.renderer.LabelRenderer;
@@ -45,8 +51,12 @@
 })
 class GCTypeNode extends InstancesContainer.Objects {
     
+    private int gcRoots;
+    private Map<Instance,Long> gcRootMap;
+
     GCTypeNode(String name) {
         super(name, DataType.CLASS.getUnsupportedValue());
+        gcRootMap = new HashMap<>();
     }
     
     
@@ -62,6 +72,29 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
         return Bundle.ClassesContainer_NodesContainer(firstNodeIdx, lastNodeIdx);
     }
     
+    void addRoot(GCRoot gcroot, Instance i, Heap heap) {
+        gcRoots++;
+        Long count = gcRootMap.get(i);
+        if (count == null) {
+            count = 1L;
+            add(i, heap);
+        } else {
+            count++;
+        }
+        gcRootMap.put(i, count);
+    }
+
+    @Override
+    protected InstanceNode createNode(Instance instance) {
+        return new GCInstanceNode(instance);
+    }
+
+    @Override
+    protected Object getValue(DataType type, Heap heap) {
+        if (type == DataType.GCROOTS) return gcRoots;
+
+        return super.getValue(type, heap);
+    }
     
     static class Renderer extends LabelRenderer implements HeapViewerRenderer {
         
@@ -72,4 +105,17 @@ static class Renderer extends LabelRenderer implements HeapViewerRenderer {
         
     }
     
+    private class GCInstanceNode extends InstanceNode {
+
+        private GCInstanceNode(Instance instance) {
+            super(instance);
+        }
+
+        @Override
+        protected Object getValue(DataType type, Heap heap) {
+            if (type == DataType.GCROOTS) return gcRootMap.get(getInstance());
+
+            return super.getValue(type, heap);
+        }
+    }
 }
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaClassesProvider.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaClassesProvider.java
@@ -210,26 +210,22 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
             }
             
             if (aggregation == 3) {
-                List<GCTypeNode> tnodes = new ArrayList<>();
                 Map<String, GCTypeNode> types = new HashMap<>();
                 for (Instance instance : gcrootInstances) {
                     Collection<GCRoot> igcroots = heap.getGCRoots(instance);
-                    Set<String> typeSet = new HashSet<>();
                     for (GCRoot gcroot : igcroots) {
                         String tname = gcroot.getKind();
-                        if (typeSet.add(tname)) {
-                            GCTypeNode tnode = types.get(tname);
-                            if (tnode == null) {
-                                tnode = new GCTypeNode(tname);
-                                tnodes.add(tnode);
-                                types.put(tname, tnode);
-                            }
-                            tnode.add(gcroot.getInstance(), heap);
+                        GCTypeNode tnode = types.get(tname);
+
+                        if (tnode == null) {
+                            tnode = new GCTypeNode(tname);
+                            types.put(tname, tnode);
                         }
+                        tnode.addRoot(gcroot, instance, heap);
                     }
                 }
-                return tnodes.isEmpty() ? new HeapViewerNode[] { new TextNode(GCRoots_Messages.getNoItemsString(viewFilter)) } :
-                                          tnodes.toArray(HeapViewerNode.NO_NODES);
+                return types.isEmpty() ? new HeapViewerNode[] { new TextNode(GCRoots_Messages.getNoItemsString(viewFilter)) } :
+                                          types.values().toArray(HeapViewerNode.NO_NODES);
             } else {
                 List<InstancesContainer.Objects> cnodes = new ArrayList<>();
                 Map<String, InstancesContainer.Objects> classes = new HashMap<>();
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaObjectsView.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaObjectsView.java
@@ -86,7 +86,8 @@
 })
 public class JavaObjectsView extends HeapViewerFeature {
     
-    private static final TreeTableView.ColumnConfiguration CCONF_CLASS = new TreeTableView.ColumnConfiguration(DataType.COUNT, null, DataType.COUNT, SortOrder.DESCENDING, Boolean.FALSE);
+    private static final TreeTableView.ColumnConfiguration CCONF_CLASS = new TreeTableView.ColumnConfiguration(DataType.COUNT, DataType.GCROOTS, DataType.COUNT, SortOrder.DESCENDING, Boolean.FALSE);
+    private static final TreeTableView.ColumnConfiguration CCONF_GCROOT = new TreeTableView.ColumnConfiguration(DataType.GCROOTS, null, DataType.GCROOTS, SortOrder.DESCENDING, Boolean.TRUE);
     private static final TreeTableView.ColumnConfiguration CCONF_INSTANCE = new TreeTableView.ColumnConfiguration(null, DataType.COUNT, DataType.OWN_SIZE, SortOrder.DESCENDING, null);
     
     private static final TreeTableView.ColumnConfiguration CCONF_PRES1 = new TreeTableView.ColumnConfiguration(DataType.COUNT, null, DataType.COUNT, SortOrder.DESCENDING, Boolean.TRUE);
@@ -444,8 +445,21 @@ protected void fireItemStateChanged(ItemEvent e) {
                 // invoked also from constructor: super(aggregation.getIcon(), selected)
                 // in this case aggregation is still null, ignore the event...
                 if (e.getStateChange() == ItemEvent.SELECTED && aggregation != null) {
-                    TreeTableView.ColumnConfiguration cconf = Aggregation.INSTANCES.equals(aggregation) ?
-                                                              CCONF_INSTANCE : CCONF_CLASS;
+                    TreeTableView.ColumnConfiguration cconf;
+                    switch (aggregation) {
+                        case INSTANCES:
+                            cconf = CCONF_INSTANCE;
+                            break;
+                        case CLASSES:
+                        case PACKAGES:
+                            cconf = CCONF_CLASS;
+                            break;
+                        case TYPES:
+                            cconf = CCONF_GCROOT;
+                            break;
+                        default:
+                            throw new IllegalArgumentException(aggregation.toString());
+                    }
                     setAggregation(aggregation, cconf);
                 }
             }
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/model/DataType.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/model/DataType.java
@@ -61,6 +61,7 @@ public class DataType<T> {
     
     public static final DataType<String> NAME = new DataType<>(String.class, NO_VALUE_STRING, UNSUPPORTED_VALUE_STRING);
     public static final DataType<Integer> COUNT = new DataType<>(Integer.class, NO_VALUE_INTEGER, UNSUPPORTED_VALUE_INTEGER);
+    public static final DataType<Integer> GCROOTS = new DataType<>(Integer.class, NO_VALUE_INTEGER, UNSUPPORTED_VALUE_INTEGER);
     public static final DataType<Long> OWN_SIZE = new DataType<>(Long.class, NO_VALUE_LONG, UNSUPPORTED_VALUE_LONG);
     
     public static final DataType<Long> RETAINED_SIZE = new RetainedSize();
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/TreeTableViewColumn.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/TreeTableViewColumn.java
@@ -45,7 +45,8 @@
     "TreeTableViewColumn_ColCount=Count",
     "TreeTableViewColumn_ColSize=Size",
     "TreeTableViewColumn_ColRetained=Retained",
-    "TreeTableViewColumn_ColObjectId=Object ID"
+    "TreeTableViewColumn_ColObjectId=Object ID",
+    "TreeTableViewColumn_GCRoots=GC Roots"
 })
 public class TreeTableViewColumn extends TableColumn {
     
@@ -92,7 +93,8 @@ public static TreeTableViewColumn[] classes(Heap heap, boolean sort) {
             new Count(heap),
             new OwnSize(heap, true, sort),
             new RetainedSize(heap),
-            new ObjectID()
+            new ObjectID(),
+            new GCRoots(heap,false,false)
         };
     }
     
@@ -215,6 +217,29 @@ public Count(Heap heap, boolean initiallyVisible, boolean initiallySorting) {
         
     }
     
+    public static class GCRoots extends TreeTableViewColumn {
+
+        private final HideableBarRenderer renderer;
+        private final int preferredWidth;
+
+        public GCRoots(Heap heap) {
+            this(heap, true, false);
+        }
+
+        public GCRoots(Heap heap, boolean initiallyVisible, boolean initiallySorting) {
+            super(Bundle.TreeTableViewColumn_GCRoots(), 190, DataType.GCROOTS, initiallyVisible, initiallySorting);
+
+            renderer = new HideableBarRenderer(HeapViewerNumberRenderer.decimalInstance(DataType.GCROOTS));
+            renderer.setMaxValue(Integer.MAX_VALUE / 1000);
+            preferredWidth = renderer.getMaxNoBarWidth() - 20;
+            renderer.setMaxValue(heap.getGCRoots().size());
+        }
+
+        public int getPreferredWidth() { return preferredWidth; }
+
+        public ProfilerRenderer getRenderer() { return renderer; }
+    }
+
     public static class OwnSize extends TreeTableViewColumn {
         
         private final HideableBarRenderer renderer;
