Fixed AIOOBE when subsequently opening HeapViewPlugins

jisedlac · jisedlac · commit c02925091d80 · 2020-05-07T17:34:05.000+02:00
- reworked the cleanup code when a HeapViewPlugin is closed
diff --git a/visualvm/heapviewer.truffle/nbproject/project.xml b/visualvm/heapviewer.truffle/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/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectPreviewPlugin.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectPreviewPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -70,6 +70,11 @@ public TruffleObjectPreviewPlugin(HeapContext context) {
     protected abstract Instance getPreviewInstance(HeapViewerNode node);
     
     
+    @Override
+    protected void closed() {
+        // TODO: should cancel the preview
+    }
+    
     @Override
     protected void nodeSelected(HeapViewerNode node, boolean adjusting) {
         component.showInstance(supportsNode(node) ? getPreviewInstance(node) : null);
diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectPropertyPlugin.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectPropertyPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -267,6 +267,7 @@ protected JComponent createComponent() {
     
     @Override
     protected void closed() {
+        synchronized (objectsView) { selected = objectsView.getRoot(); }
         objectsView.closed();
     }
     
diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/javaext/TruffleJavaViewPlugin.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/javaext/TruffleJavaViewPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -96,6 +96,7 @@ protected JComponent createComponent() {
     
     @Override
     protected void closed() {
+        synchronized (objectsView) { selected = TruffleViewPlugin.NO_INSTANCE; }
         objectsView.closed();
     }
     
diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/javaext/TruffleViewPlugin.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/javaext/TruffleViewPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -48,6 +48,7 @@
 import org.graalvm.visualvm.heapviewer.ui.HeapViewerActions;
 import org.graalvm.visualvm.heapviewer.ui.TreeTableView;
 import org.graalvm.visualvm.heapviewer.ui.TreeTableViewColumn;
+import org.graalvm.visualvm.lib.jfluid.heap.JavaClass;
 import org.openide.util.ImageUtilities;
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
@@ -63,6 +64,9 @@
 })
 class TruffleViewPlugin extends HeapViewPlugin {
     
+    static final Instance NO_INSTANCE = new FakeInstance();
+    
+    
     private final Heap heap;
     private Instance selected;
     
@@ -104,6 +108,7 @@ protected JComponent createComponent() {
     
     @Override
     protected void closed() {
+        synchronized (objectsView) { selected = NO_INSTANCE; }
         objectsView.closed();
     }
     
@@ -135,4 +140,23 @@ public HeapViewPlugin createPlugin(HeapContext context, HeapViewerActions action
         
     }
     
+    
+    private static class FakeInstance implements Instance {
+        @Override public List getFieldValues()                      { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public boolean isGCRoot()                         { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public long getInstanceId()                       { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public int getInstanceNumber()                    { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public JavaClass getJavaClass()                   { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public Instance getNearestGCRootPointer()         { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public long getReachableSize()                    { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public List getReferences()                       { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public long getRetainedSize()                     { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public long getSize()                             { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public List getStaticFieldValues()                { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public Object getValueOfField(String name)        { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        
+        @Override public boolean equals(Object o)                   { return o == this; }
+        @Override public int hashCode()                             { return -1; }
+    }
+    
 }
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.0
+OpenIDE-Module-Specification-Version: 2.1
 
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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -64,7 +64,8 @@
 })
 public class ClassHierarchyPlugin extends HeapViewPlugin {
     
-    private static final JavaClass EMPTY_CLASS = new EmptyJavaClass();
+    private static final JavaClass NO_CLASS = new FakeClass();
+    private static final JavaClass EMPTY_CLASS = new FakeClass();
     
     private final Heap heap;
     private JavaClass selected;
@@ -112,7 +113,7 @@ protected HeapViewerNode[] computeData(RootNode root, Heap heap, String viewID,
                     node.setChildren(HeapViewerNode.NO_NODES);
                     return new HeapViewerNode[] { firstNode };
                 }
-
+                
                 return new HeapViewerNode[] { new TextNode(Bundle.ClassHierarchyPlugin_NoSelection()) };
             }
             protected void childrenChanged() {
@@ -124,14 +125,15 @@ protected void childrenChanged() {
             }
         };
     }
-
+    
     protected JComponent createComponent() {
         return objectsView.getComponent();
     }
     
     
     @Override
     protected void closed() {
+        synchronized (objectsView) { selected = NO_CLASS; }
         objectsView.closed();
     }
     
@@ -169,24 +171,25 @@ public boolean isLeaf() {
     }
     
     
-    private static class EmptyJavaClass implements JavaClass {
-        @Override public Object getValueOfStaticField(String name) { return null; }
-        @Override public long getAllInstancesSize() { return -1; }
-        @Override public boolean isArray() { return false; }
-        @Override public Instance getClassLoader() { return null; }
-        @Override public List getFields() { return null; }
-        @Override public int getInstanceSize() { return -1; }
-        @Override public List getInstances() { return null; }
-        @Override public Iterator getInstancesIterator() { return null; }
-        @Override public int getInstancesCount() { return -1; }
-        @Override public long getRetainedSizeByClass() { return -1; }
-        @Override public long getJavaClassId() { return -1; }
-        @Override public String getName() { return null; }
-        @Override public List getStaticFieldValues() { return null; }
-        @Override public Collection getSubClasses() { return null; }
-        @Override public JavaClass getSuperClass() { return null; }
-        @Override public boolean equals(Object o) { return o == this; }
-        @Override public int hashCode() { return -1; }
+    private static class FakeClass implements JavaClass {
+        @Override public Object getValueOfStaticField(String name)  { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public long getAllInstancesSize()                 { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public boolean isArray()                          { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public Instance getClassLoader()                  { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public List getFields()                           { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public int getInstanceSize()                      { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public List getInstances()                        { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public Iterator getInstancesIterator()            { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public int getInstancesCount()                    { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public long getRetainedSizeByClass()              { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public long getJavaClassId()                      { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public String getName()                           { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public List getStaticFieldValues()                { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public Collection getSubClasses()                 { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        @Override public JavaClass getSuperClass()                  { throw new UnsupportedOperationException("Not supported."); } // NOI18N
+        
+        @Override public boolean equals(Object o)                   { return o == this; }
+        @Override public int hashCode()                             { return -1; }
     }
     
     
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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -288,6 +288,7 @@ protected JComponent createComponent() {
     
     @Override
     protected void closed() {
+        synchronized (objectsView) { selected = objectsView.getRoot(); }
         objectsView.closed();
     }
     
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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -307,6 +307,7 @@ protected JComponent createComponent() {
     
     @Override
     protected void closed() {
+        synchronized (objectsView) { selected = objectsView.getRoot(); }
         objectsView.closed();
     }
     
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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -346,6 +346,7 @@ protected void nodeSelected(final HeapViewerNode node, boolean adjusting) {
     
     @Override
     protected void closed() {
+        synchronized (objectsView) { selected = objectsView.getRoot(); }
         objectsView.closed();
     }
     
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/model/RootNode.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/model/RootNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -90,8 +90,10 @@ protected void handleOOME(OutOfMemoryError e) {
 //    }
     
     
-    public void resetChildren() {
+    public void reset(boolean makeEmpty) {
         super.resetChildren();
+        if (makeEmpty) super.setChildren(HeapViewerNode.NO_NODES);
+        updateChildren(null);
     }
     
     
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HeapViewPlugin.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/HeapViewPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -42,10 +42,9 @@
 public abstract class HeapViewPlugin extends HeapView {
     
     private boolean showing;
-    private boolean updatePending;
     
-    private HeapViewerNode pendingNode;
-    private boolean pendingAdjusting;
+    private HeapViewerNode currentNode;
+    private boolean currentAdjusting;
     
     private JComponent component;
     
@@ -73,9 +72,7 @@ public final JComponent getComponent() {
                 public void hierarchyChanged(HierarchyEvent e) {
                     if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) != 0) {
                         showing = component.isShowing();
-                        if (showing && updatePending) {
-                            doNodeSelectedImpl(pendingNode, pendingAdjusting);
-                        }
+                        if (showing) doNodeSelectedImpl(currentNode, currentAdjusting);
                     }
                 }
             });
@@ -90,18 +87,12 @@ public final ProfilerToolbar getToolbar() {
         
     
     void doNodeSelected(HeapViewerNode node, boolean adjusting) {
-        if (showing) {
-            doNodeSelectedImpl(node, adjusting);
-        } else {
-            updatePending = true;
-            pendingNode = node;
-            pendingAdjusting = adjusting;
-        }
+        currentNode = node;
+        currentAdjusting = adjusting;
+        if (showing) doNodeSelectedImpl(currentNode, currentAdjusting);
     }
     
     private void doNodeSelectedImpl(HeapViewerNode node, boolean adjusting) {
-        updatePending = false;
-        pendingNode = null;
         if (!adjusting || acceptsAdjustingSelection()) nodeSelected(node, adjusting);
     }
     
diff --git a/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/PluggableTreeTableView.java b/visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/ui/PluggableTreeTableView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -222,11 +222,12 @@ private static class PluginContainer extends JPanel {
         }
         
         public void setVisible(boolean visible) {
-            if (visible && getComponentCount() < 2)
-                add(plugin.getComponent(), BorderLayout.CENTER);
+            boolean firstTime = getComponentCount() < 2;
+            
+            if (visible && firstTime) add(plugin.getComponent(), BorderLayout.CENTER);
             super.setVisible(visible);
             
-            if (!visible) plugin.closed();
+            if (!visible && !firstTime) 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -233,16 +233,17 @@ public RootNode getRoot() {
     
     public void reloadView() {
         if (component != null) {
-            Root _root = (Root)getRoot();
-            if (_root != currentRoot) pinNode(null);
-            _root.resetChildren();
-            _root.updateChildren(null);
+            if (root != currentRoot) pinNode(null);
+            root.reset(false);
         }
     }
     
     
     public void closed() {
-        root.resetChildren();
+        if (component != null) {
+            if (root != currentRoot) pinNode(null);
+            root.reset(true);
+        }
     }
     
     

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -267,6 +267,7 @@ protected JComponent createComponent() {`
`267`	`267`
`268`	`268`	`@Override`
`269`	`269`	`protected void closed() {`
	`270`	`+ synchronized (objectsView) { selected = objectsView.getRoot(); }`
`270`	`271`	`objectsView.closed();`
`271`	`272`	`}`
`272`	`273`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -96,6 +96,7 @@ protected JComponent createComponent() {`
`96`	`96`
`97`	`97`	`@Override`
`98`	`98`	`protected void closed() {`
	`99`	`+ synchronized (objectsView) { selected = TruffleViewPlugin.NO_INSTANCE; }`
`99`	`100`	`objectsView.closed();`
`100`	`101`	`}`
`101`	`102`