Cancel worker threads whenever their view is closed, including closing the heap viewer itself.

jisedlac · jisedlac · commit c9df26ce174a · 2018-11-27T19:21:02.000+01:00
diff --git a/visualvm/heapdump/nbproject/project.xml b/visualvm/heapdump/nbproject/project.xml
@@ -39,59 +39,59 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <specification-version>1.0</specification-version>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.graalvm.visualvm.tools</code-name-base>
+                    <code-name-base>org.graalvm.visualvm.lib.jfluid</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>0</release-version>
-                        <specification-version>1.2</specification-version>
+                        <release-version>1</release-version>
+                        <specification-version>1.10.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
+                    <code-name-base>org.graalvm.visualvm.lib.profiler</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.48</specification-version>
+                        <release-version>3</release-version>
+                        <specification-version>3.28</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.api.progress.nb</code-name-base>
+                    <code-name-base>org.graalvm.visualvm.lib.profiler.heapwalker</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.48</specification-version>
+                        <specification-version>1.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.graalvm.visualvm.lib.jfluid</code-name-base>
+                    <code-name-base>org.graalvm.visualvm.tools</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.10.1</specification-version>
+                        <release-version>0</release-version>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.graalvm.visualvm.lib.profiler</code-name-base>
+                    <code-name-base>org.netbeans.api.progress</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>3.28</specification-version>
+                        <release-version>1</release-version>
+                        <specification-version>1.48</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.graalvm.visualvm.lib.profiler.heapwalker</code-name-base>
+                    <code-name-base>org.netbeans.api.progress.nb</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.1</specification-version>
+                        <specification-version>1.48</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/heapdump/src/org/graalvm/visualvm/heapdump/impl/HeapDumpView.java b/visualvm/heapdump/src/org/graalvm/visualvm/heapdump/impl/HeapDumpView.java
@@ -52,8 +52,13 @@
  * @author Tomas Hurka
  */
 class HeapDumpView extends DataSourceView {
+    
     private final static Logger LOGGER = Logger.getLogger(HeapDumpView.class.getName());
     
+    
+    private MasterViewSupport mvs;
+    
+    
     public HeapDumpView(HeapDump heapDump) {
         this(heapDump, DataSourceDescriptorFactory.getDescriptor(heapDump));
     }
@@ -65,8 +70,8 @@ private HeapDumpView(HeapDump heapDump, DataSourceDescriptor descriptor) {
         
     protected DataViewComponent createComponent() {
         HeapDump heapDump = (HeapDump)getDataSource();
-        DataViewComponent dvc = new DataViewComponent(
-                new MasterViewSupport(heapDump).getMasterView(),
+        mvs = new MasterViewSupport(heapDump);
+        DataViewComponent dvc = new DataViewComponent(mvs.getMasterView(),
                 new DataViewComponent.MasterViewConfiguration(true));
         
         return dvc;
@@ -95,6 +100,12 @@ private static boolean isClosableView(HeapDump heapDump) {
         return false;
     }
     
+    protected void removed() {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() { if (mvs != null) mvs.closed(); }
+        });
+    }
+    
     
     // --- General data --------------------------------------------------------
     
@@ -103,6 +114,8 @@ private static class MasterViewSupport extends JPanel  {
         private JLabel progressLabel;
         private JPanel contentsPanel;
         
+        private HeapViewer heapViewer;
+        
         public MasterViewSupport(HeapDump heapDump) {
             File file = heapDump.getFile();
             initComponents(file != null);
@@ -115,6 +128,11 @@ public DataViewComponent.MasterView getMasterView() {
         }
         
         
+        void closed() {
+            if (heapViewer != null) heapViewer.closed();
+        }
+        
+        
         private void initComponents(boolean hasDump) {
             setLayout(new BorderLayout());
             
@@ -134,8 +152,9 @@ private void loadHeap(final File file) {
           RequestProcessor.getDefault().post(new Runnable() {
             public void run() {
               try {
-                final HeapViewer heapViewer = new HeapViewer(file);
+                final HeapViewer _heapViewer = new HeapViewer(file);
                 SwingUtilities.invokeLater(new Runnable() { public void run() {
+                    heapViewer = _heapViewer;
                     contentsPanel.remove(progressLabel);
                     contentsPanel.add(heapViewer.getComponent(), BorderLayout.CENTER);
                     contentsPanel.revalidate();
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/0
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/heapviewer/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 
diff --git a/visualvm/heapviewer/nbproject/project.xml b/visualvm/heapviewer/nbproject/project.xml
@@ -65,7 +65,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <specification-version>1.6</specification-version>
+                        <specification-version>1.7</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/HeapViewer.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/HeapViewer.java
@@ -87,6 +87,11 @@ public JComponent getComponent() {
         if (component == null) component = new HeapViewerComponent(this);
         return component;
     }
+    
+    
+    public void closed() {
+        if (component != null) component.closed();
+    }
 
     
     private static Heap createHeap(File heapFile) throws IOException {
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/ClassHierarchyPlugin.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/ClassHierarchyPlugin.java
@@ -130,6 +130,12 @@ protected JComponent createComponent() {
     }
     
     
+    @Override
+    protected void closed() {
+        objectsView.closed();
+    }
+    
+    
     protected void nodeSelected(HeapViewerNode node, boolean adjusting) {
         JavaClass sel = node == null ? null : HeapViewerNode.getValue(node, DataType.CLASS, heap);
         
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaDiffObjectsView.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaDiffObjectsView.java
@@ -230,6 +230,12 @@ public ProfilerToolbar getToolbar() {
     }
     
     
+    @Override
+    protected void closed() {
+        objectsView.closed();
+    }
+    
+    
     private synchronized void setAggregation(Aggregation aggregation) {
         this.aggregation = aggregation;
         objectsView.reloadView();
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaFieldsPlugin.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaFieldsPlugin.java
@@ -278,6 +278,12 @@ protected JComponent createComponent() {
     }
     
     
+    @Override
+    protected void closed() {
+        objectsView.closed();
+    }
+    
+    
     private HeapViewerNode[] getClassFieldsHistogram(final InstancesWrapper instances, HeapViewerNode parent, Heap heap, String viewID, HeapViewerNodeFilter viewFilter, List<DataType> dataTypes, List<SortOrder> sortOrders, Progress progress) throws InterruptedException {
         final List<Field> fields = getAllInstanceFields(instances.getJavaClass());
         NodesComputer<Field> computer = new NodesComputer<Field>(fields.size(), UIThresholds.MAX_INSTANCE_FIELDS) {
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
@@ -217,6 +217,12 @@ public ProfilerToolbar getToolbar() {
     }
     
     
+    @Override
+    protected void closed() {
+        objectsView.closed();
+    }
+    
+    
     private volatile boolean skipReload = false;
     
     void configureClassesByInstancesCount() {
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaPreviewPlugin.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaPreviewPlugin.java
@@ -75,6 +75,12 @@ protected JComponent createComponent() {
     }
     
     
+    @Override
+    protected void closed() {
+        // TODO: should cancel the preview
+    }
+    
+    
     protected void nodeSelected(HeapViewerNode node, boolean adjusting) {
         component.showInstance(node == null ? null : HeapViewerNode.getValue(node, DataType.INSTANCE, heap));
     }
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaReferencesPlugin.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaReferencesPlugin.java
@@ -205,6 +205,12 @@ protected JComponent createComponent() {
     }
     
     
+    @Override
+    protected void closed() {
+        objectsView.closed();
+    }
+    
+    
     private static InterruptibleIterator<Instance> instancesIterator(InstancesWrapper instances) {
         return new InterruptibleIterator(instances.getInstancesIterator());
     }
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaThreadsView.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaThreadsView.java
@@ -170,6 +170,12 @@ public ProfilerToolbar getToolbar() {
     }
     
     
+    @Override
+    protected void closed() {
+        objectsView.closed();
+    }
+    
+    
     void selectInstance(long instanceID, String viewID) {
         if (rHTML == null) init();
         
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaWindowsView.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaWindowsView.java
@@ -144,6 +144,12 @@ public ProfilerToolbar getToolbar() {
     }
     
     
+    @Override
+    protected void closed() {
+        // TODO: should cancel the preview
+    }
+    
+    
     private void init() {
         component = new JPanel(null);
         component.setLayout(new BorderLayout());
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/PathToGCRootPlugin.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/PathToGCRootPlugin.java
@@ -237,6 +237,12 @@ protected void nodeSelected(final HeapViewerNode node, boolean adjusting) {
     }
     
     
+    @Override
+    protected void closed() {
+        objectsView.closed();
+    }
+    
+    
     private static Collection<HeapViewerNode> computeInstanceRoots(Instance instance, Progress progress) throws InterruptedException {
         Instance nextInstance = instance.getNearestGCRootPointer();
                     
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/oql/OQLConsoleView.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/oql/OQLConsoleView.java
@@ -214,6 +214,12 @@ public ProfilerToolbar getToolbar() {
     }
     
     
+    @Override
+    protected void closed() {
+        if (objectsView != null) objectsView.closed();
+    }
+    
+    
     private void init() {
         toolbar = ProfilerToolbar.create(false);
         
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HeapView.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HeapView.java
@@ -70,4 +70,6 @@ protected void showing() {}
     
     protected void hidden() {}
     
+    protected void closed() {}
+    
 }
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HeapViewerComponent.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HeapViewerComponent.java
@@ -189,7 +189,12 @@ private void initComponents() {
         views = ProfilerTabbedView.createBottom(true, true, new ChangeListener() {
             public void stateChanged(ChangeEvent e) {
                 final JComponent newComponent = views.getSelectedView();
-                viewSelected(getView(newComponent));
+                if (newComponent != null) viewSelected(getView(newComponent));
+            }
+        });
+        views.addViewListener(new ProfilerTabbedView.Listener() {
+            public void viewRemoved(JComponent view) {
+                HeapViewerComponent.this.viewClosed(getView(view));
             }
         });
         add(views.getComponent(), BorderLayout.CENTER);
@@ -250,11 +255,20 @@ private void viewSelected(HeapView newView) {
         if (currentViewToolbar != null) viewToolbar.add(currentViewToolbar);
     }
     
+    private void viewClosed(HeapView view) {
+        view.closed();
+    }
+    
     private void updateViewTab(HeapView view) {
         if (views.getViewsCount() > 0) views.updateView(view.getComponent(), view.getName(), view.getIcon(), view.getDescription());
     }
     
     
+    public void closed() {
+        if (views != null) views.removeAllViews();
+    }
+    
+    
     private class MainView extends HeapView {
         
         private PopupButton featureChooser;
@@ -321,6 +335,14 @@ protected void hidden() {
         }
         
         
+        @Override
+        protected void closed() {
+            for (HeapViewerFeature[] featureArr : features)
+                    for (HeapViewerFeature feature : featureArr)
+                        feature.closed();
+        }
+        
+        
         void selectFeature(HeapContext context, HeapViewerFeature feature) {
             if (selectedFeature != null) selectedFeature.hidden();
             
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/NodeObjectsView.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/NodeObjectsView.java
@@ -120,6 +120,12 @@ public ProfilerToolbar getToolbar() {
     }
     
     
+    @Override
+    protected void closed() {
+        objectsView.closed();
+    }
+    
+    
     private void initUI() {
         HeapViewerRenderer renderer = objectsView.getNodeRenderer(viewNode);
         name = renderer.getShortName();
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/PluggableTreeTableView.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/PluggableTreeTableView.java
@@ -120,6 +120,15 @@ public boolean requestFocusInWindow() {
     }
     
     
+    public void closed() {
+        if (pluginsComponent != null && pluginsComponent.isVisible()) {
+            for (Component comp : pluginsComponent.getComponents())
+                if (comp.isVisible()) comp.setVisible(false); // PluginContainer.setVisible(false) calls plugin.closed()
+        }
+        super.closed();
+    }
+    
+    
     private void init() {
         toolbar = ProfilerToolbar.create(false);
         
@@ -216,6 +225,8 @@ public void setVisible(boolean visible) {
             if (visible && getComponentCount() < 2)
                 add(plugin.getComponent(), BorderLayout.CENTER);
             super.setVisible(visible);
+            
+            if (!visible) plugin.closed();
         }
         
     }
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/TreeTableView.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/TreeTableView.java
diff --git a/visualvm/uisupport/manifest.mf b/visualvm/uisupport/manifest.mf
diff --git a/visualvm/uisupport/src/org/graalvm/visualvm/uisupport/ProfilerTabbedView.java b/visualvm/uisupport/src/org/graalvm/visualvm/uisupport/ProfilerTabbedView.java

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,12 @@ protected JComponent createComponent() {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`
	`78`	`+ @Override`
	`79`	`+ protected void closed() {`
	`80`	`+ // TODO: should cancel the preview`
	`81`	`+ }`
	`82`	`+`
	`83`	`+`
`78`	`84`	`protected void nodeSelected(HeapViewerNode node, boolean adjusting) {`
`79`	`85`	`component.showInstance(node == null ? null : HeapViewerNode.getValue(node, DataType.INSTANCE, heap));`
`80`	`86`	`}`