GH-423 allow to filter zero self-time nodes

Author: thurka

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/Bundle.properties

@@ -176,6 +176,7 @@ CPUView_FilterScopeTooltip=Filter scope
 CPUView_SearchCalleesScope=Search Callees
 CPUView_SearchCallersScope=Search Callers
 CPUView_SearchScopeTooltip=Search scope
+CPUView_HideZeroSelfTimeTooltip=Hide Nodes With Zero Self Time
 CPUView_ExpandMenu=Expand / Collapse
 CPUView_ExpandPlainItem=Expand Plain Path
 CPUView_ExpandTopmostItem=Expand Topmost Path

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/CPUTreeTableView.java

@@ -36,9 +36,11 @@
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JLabel;
 import javax.swing.JPopupMenu;
+import javax.swing.JToggleButton;
 import javax.swing.JTree;
 import javax.swing.RowFilter;
 import javax.swing.SortOrder;
+import javax.swing.SwingUtilities;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import org.graalvm.visualvm.lib.jfluid.client.ClientUtils;
@@ -325,34 +327,64 @@ public boolean include(RowFilter.Entry entry) {
     }
 
     protected Component[] getFilterOptions() {
-        if (!reverse) return super.getFilterOptions();
-        
-        PopupButton pb = new PopupButton (Icons.getIcon(ProfilerIcons.TAB_CALL_TREE)) {
-            protected void populatePopup(JPopupMenu popup) {
-                popup.add(new JCheckBoxMenuItem(FILTER_CALLEES_SCOPE, filterTopMethods) {
-                    {
-                        if (!filterCallerMethods) setEnabled(false);
-                    }
-                    protected void fireActionPerformed(ActionEvent e) {
-                        super.fireActionPerformed(e);
-                        filterTopMethods = !filterTopMethods;
-                        enableFilter();
-                    }
-                });
-                popup.add(new JCheckBoxMenuItem(FILTER_CALLERS_SCOPE, filterCallerMethods) {
-                    {
-                        if (!filterTopMethods) setEnabled(false);
-                    }
-                    protected void fireActionPerformed(ActionEvent e) {
-                        super.fireActionPerformed(e);
-                        filterCallerMethods = !filterCallerMethods;
-                        enableFilter();
-                    }
-                });
+        if (reverse) {
+            PopupButton pb = new PopupButton (Icons.getIcon(ProfilerIcons.TAB_CALL_TREE)) {
+                protected void populatePopup(JPopupMenu popup) {
+                    popup.add(new JCheckBoxMenuItem(FILTER_CALLEES_SCOPE, filterTopMethods) {
+                        {
+                            if (!filterCallerMethods) setEnabled(false);
+                        }
+                        protected void fireActionPerformed(ActionEvent e) {
+                            super.fireActionPerformed(e);
+                            filterTopMethods = !filterTopMethods;
+                            enableFilter();
+                        }
+                    });
+                    popup.add(new JCheckBoxMenuItem(FILTER_CALLERS_SCOPE, filterCallerMethods) {
+                        {
+                            if (!filterTopMethods) setEnabled(false);
+                        }
+                        protected void fireActionPerformed(ActionEvent e) {
+                            super.fireActionPerformed(e);
+                            filterCallerMethods = !filterCallerMethods;
+                            enableFilter();
+                        }
+                    });
+                }
+            };
+            pb.setToolTipText(FILTER_SCOPE_TOOLTIP);
+            return new Component[] { Box.createHorizontalStrut(5), pb };
+        } else {
+            final RowFilter zeroFilter = new RowFilterImpl();
+            final JToggleButton zeroSelfTime = new JToggleButton(Icons.getIcon(ProfilerIcons.NODE_LEAF)) {
+
+                protected void fireActionPerformed(ActionEvent e) {
+                    super.fireActionPerformed(e);
+                    boolean selected = isSelected();
+
+                    SwingUtilities.invokeLater(() -> {
+                        if (selected) {
+                            treeTable.addRowFilter(zeroFilter);
+                        } else {
+                            treeTable.removeRowFilter(zeroFilter);
+                        }
+                    });
+                }
+            };
+            zeroSelfTime.setToolTipText(HIDE_ZERO_SELF_TIME_TOOLTIP);
+            return new Component[]{Box.createHorizontalStrut(5), zeroSelfTime};
+        }
+    }
+
+    private static class RowFilterImpl extends RowFilter implements ProfilerTreeTable.DeleteNodes {
+
+        public boolean include(RowFilter.Entry entry) {
+            PrestimeCPUCCTNode node = (PrestimeCPUCCTNode) entry.getIdentifier();
+            if (node.isSelfTimeNode() && node.getTotalTime0() == 0) {
+                return false;
             }
-        };
-        pb.setToolTipText(FILTER_SCOPE_TOOLTIP);
-        return new Component[] { Box.createHorizontalStrut(5), pb };
+            return true;
+        }
     }
 
     protected SearchUtils.TreeHelper getSearchHelper() {

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/cpu/CPUView.java

@@ -69,6 +69,7 @@ public abstract class CPUView extends DataView {
     static final String SEARCH_CALLEES_SCOPE = messages.getString("CPUView_SearchCalleesScope"); // NOI18N
     static final String SEARCH_CALLERS_SCOPE = messages.getString("CPUView_SearchCallersScope"); // NOI18N
     static final String SEARCH_SCOPE_TOOLTIP = messages.getString("CPUView_SearchScopeTooltip"); // NOI18N
+    static final String HIDE_ZERO_SELF_TIME_TOOLTIP = messages.getString("CPUView_HideZeroSelfTimeTooltip"); // NOI18N
     static final String EXPAND_MENU = messages.getString("CPUView_ExpandMenu"); // NOI18N
     static final String EXPAND_PLAIN_ITEM = messages.getString("CPUView_ExpandPlainItem"); // NOI18N
     static final String EXPAND_TOPMOST_ITEM = messages.getString("CPUView_ExpandTopmostItem"); // NOI18N

visualvm/libs.profiler/lib.profiler.ui/src/org/graalvm/visualvm/lib/ui/swing/ProfilerTreeTable.java

@@ -440,6 +440,7 @@ public static abstract class NodeExpansionEvaluator {
 
     }
 
+    public static interface DeleteNodes {}
 
     public void setCellRenderer(TreeCellRenderer renderer) {
         if (tree != null) {
@@ -960,6 +961,7 @@ protected void fireTreeStructureChanged(Object source, Object[] path,
         private List filteredChildren(Object parent) {
             if (cache == null) cache = new HashMap();
 
+            boolean createFilteredNode = !(filter instanceof DeleteNodes);
             TreeNode tParent = (TreeNode)parent;
             TreePathKey parentKey = new TreePathKey(getPathToRoot(tParent));
             List children = cache.get(parentKey);
@@ -977,7 +979,7 @@ private List filteredChildren(Object parent) {
                     else entry.setContext(renderer.toString(), child);
                     if (filter.include(entry)) {
                         children.add(child);
-                    } else if (parent instanceof CCTNode) {
+                    } else if (createFilteredNode && parent instanceof CCTNode) {
                         if (filtered == null) filtered = ((CCTNode)child).createFilteredNode();
                         else filtered.merge((CCTNode)child);
                     }