Use HeapOperations.initializeReferences(heap) when accessing guest language references

jisedlac · jisedlac · commit b68bf3ca8d2d · 2018-11-19T16:40:31.000+01:00
diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedFields.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedFields.java
@@ -89,7 +89,7 @@ abstract class TruffleObjectMergedFields<O extends TruffleObject> {
     
     protected abstract boolean filtersFields();
     protected abstract boolean includeField(FieldValue field);
-    protected abstract Collection<FieldValue> getFields(O object);
+    protected abstract Collection<FieldValue> getFields(O object) throws InterruptedException;
     
     
     private int objectsCount() { return objects.getObjectsCount(); }
@@ -158,19 +158,21 @@ private Set<FieldDescriptor> getAllObjectsFields(Progress progress) throws Inter
     }
     
     private FieldValue getValueOfField(O object, String name) {
-        Collection<FieldValue> fieldValues = getFields(object);
-        if (fieldValues == null) return null;
+        try {
+            Collection<FieldValue> fieldValues = getFields(object);
+            if (fieldValues == null) return null;
 
-        ArrayList<FieldValue> fieldValuesArr = fieldValues instanceof ArrayList ?
-                              (ArrayList<FieldValue>)fieldValues : new ArrayList(fieldValues);
+            ArrayList<FieldValue> fieldValuesArr = fieldValues instanceof ArrayList ?
+                                  (ArrayList<FieldValue>)fieldValues : new ArrayList(fieldValues);
 
-        for (int i = fieldValuesArr.size() - 1; i >= 0; i--) {
-            FieldValue fv = fieldValuesArr.get(i);
-            Field field = fv.getField();
-            String fieldN = field.getName();
-            if (field.isStatic()) fieldN = "static " + fieldN; // NOI18N
-            if (fieldN.equals(name)) return fv;
-        }
+            for (int i = fieldValuesArr.size() - 1; i >= 0; i--) {
+                FieldValue fv = fieldValuesArr.get(i);
+                Field field = fv.getField();
+                String fieldN = field.getName();
+                if (field.isStatic()) fieldN = "static " + fieldN; // NOI18N
+                if (fieldN.equals(name)) return fv;
+            }
+        } catch (InterruptedException e) {}
 
         return null;
     }
diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedReferences.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedReferences.java
@@ -81,7 +81,7 @@ abstract class TruffleObjectMergedReferences<O extends TruffleObject> {
     
     protected abstract boolean filtersReferences();
     protected abstract boolean includeReference(FieldValue field);
-    protected abstract Collection<FieldValue> getReferences(O object);
+    protected abstract Collection<FieldValue> getReferences(O object) throws InterruptedException;
     
     protected abstract HeapViewerNode createForeignReferenceNode(Instance instance, FieldValue field);
     
@@ -204,11 +204,13 @@ protected ProgressIterator<O> objectsIterator(int index, Progress _progress) {
                         @Override
                         protected boolean exclude(O object) {
                             progress.step();
-                            Collection<FieldValue> references = getReferences(object);
-                            for (FieldValue reference : references) {
-                                if (referer.equals(reference.getDefiningInstance()))
-                                    return false;
-                            }
+                            try {
+                                Collection<FieldValue> references = getReferences(object);
+                                for (FieldValue reference : references) {
+                                    if (referer.equals(reference.getDefiningInstance()))
+                                        return false;
+                                }
+                            } catch (InterruptedException e) {}
                             return true;
                         }
                     };
diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectPropertyProvider.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectPropertyProvider.java
@@ -110,7 +110,7 @@ protected final L getLanguage() {
     public abstract boolean supportsNode(HeapViewerNode node, Heap heap, String viewID);
     
     
-    protected abstract Collection<I> getPropertyItems(O object, Heap heap);
+    protected abstract Collection<I> getPropertyItems(O object, Heap heap) throws InterruptedException;
     
     protected boolean includeItem(I item) { return true; }
     
@@ -264,7 +264,7 @@ protected HeapViewerNode[] getNodes(TruffleObjectsWrapper<O> objects, HeapViewer
                 protected TruffleLanguage getLanguage() { return Fields.this.getLanguage(); }
                 protected boolean filtersFields() { return filtersProperties(); }
                 protected boolean includeField(FieldValue field) { return includeItem(field); }
-                protected Collection<FieldValue> getFields(O object) { return getPropertyItems(object, heap); }
+                protected Collection<FieldValue> getFields(O object) throws InterruptedException { return getPropertyItems(object, heap); }
             }.getNodes(parent, viewID, viewFilter, dataTypes, sortOrders, progress);
         }
         
@@ -274,7 +274,7 @@ protected HeapViewerNode[] getNodes(TruffleObjectsWrapper<O> objects, HeapViewer
     public static abstract class References<O extends TruffleObject, T extends TruffleType<O>, F extends TruffleLanguageHeapFragment<O, T>, L extends TruffleLanguage<O, T, F>> extends TruffleObjectPropertyProvider<O, T, F, L, FieldValue> {
         
         protected References(String propertyName, L language, boolean filtersProperties) {
-            super(propertyName, language, true, filtersProperties, UIThresholds.MAX_INSTANCE_REFERENCES);
+            super(propertyName, language, false, filtersProperties, UIThresholds.MAX_INSTANCE_REFERENCES);
         }
         
         
@@ -332,7 +332,7 @@ protected HeapViewerNode[] getNodes(final TruffleObjectsWrapper<O> objects, Heap
                 protected TruffleLanguage getLanguage() { return References.this.getLanguage(); }
                 protected boolean filtersReferences() { return filtersProperties(); }
                 protected boolean includeReference(FieldValue field) { return includeItem(field); }
-                protected Collection<FieldValue> getReferences(O object) { return getPropertyItems(object, heap); }
+                protected Collection<FieldValue> getReferences(O object) throws InterruptedException { return getPropertyItems(object, heap); }
                 protected HeapViewerNode createForeignReferenceNode(Instance instance, FieldValue field) { return References.this.createForeignReferenceNode(instance, field, heap); }
             }.getNodes(parent, viewID, viewFilter, dataTypes, sortOrders, progress);
         }
diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/javascript/JavaScriptObjectProperties.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/javascript/JavaScriptObjectProperties.java
@@ -30,6 +30,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import org.graalvm.visualvm.heapviewer.utils.HeapOperations;
 import org.graalvm.visualvm.lib.jfluid.heap.ArrayItemValue;
 import org.graalvm.visualvm.lib.jfluid.heap.FieldValue;
 import org.graalvm.visualvm.lib.jfluid.heap.Heap;
@@ -162,7 +163,8 @@ protected HeapViewerNode createObjectReferenceNode(JavaScriptObject object, Stri
         }
 
         @Override
-        protected Collection<FieldValue> getPropertyItems(JavaScriptObject object, Heap heap) {
+        protected Collection<FieldValue> getPropertyItems(JavaScriptObject object, Heap heap) throws InterruptedException {
+            HeapOperations.initializeReferences(heap);
             return object.getReferences();
         }
 
diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/python/PythonObjectProperties.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/python/PythonObjectProperties.java
@@ -29,6 +29,7 @@
 import org.graalvm.visualvm.heapviewer.truffle.TruffleObjectPropertyProvider;
 import java.util.Collection;
 import java.util.List;
+import org.graalvm.visualvm.heapviewer.utils.HeapOperations;
 import org.graalvm.visualvm.lib.jfluid.heap.FieldValue;
 import org.graalvm.visualvm.lib.jfluid.heap.Heap;
 import org.graalvm.visualvm.lib.jfluid.heap.Instance;
@@ -208,7 +209,8 @@ protected HeapViewerNode createForeignReferenceNode(Instance instance, FieldValu
         }
 
         @Override
-        protected Collection<FieldValue> getPropertyItems(PythonObject object, Heap heap) {
+        protected Collection<FieldValue> getPropertyItems(PythonObject object, Heap heap) throws InterruptedException {
+            HeapOperations.initializeReferences(heap);
             return object.getReferences();
         }
 
diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RObjectProperties.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/r/RObjectProperties.java
@@ -32,6 +32,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import org.graalvm.visualvm.heapviewer.utils.HeapOperations;
 import org.graalvm.visualvm.lib.jfluid.heap.FieldValue;
 import org.graalvm.visualvm.lib.jfluid.heap.Heap;
 import org.graalvm.visualvm.lib.jfluid.heap.Instance;
@@ -230,7 +231,8 @@ protected HeapViewerNode createForeignReferenceNode(Instance instance, FieldValu
         }
 
         @Override
-        protected Collection<FieldValue> getPropertyItems(RObject object, Heap heap) {
+        protected Collection<FieldValue> getPropertyItems(RObject object, Heap heap) throws InterruptedException {
+            HeapOperations.initializeReferences(heap);
             return object.getReferences();
         }
 
diff --git a/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/ruby/RubyObjectProperties.java b/visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/lang/ruby/RubyObjectProperties.java
@@ -30,6 +30,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import org.graalvm.visualvm.heapviewer.utils.HeapOperations;
 import org.graalvm.visualvm.lib.jfluid.heap.ArrayItemValue;
 import org.graalvm.visualvm.lib.jfluid.heap.FieldValue;
 import org.graalvm.visualvm.lib.jfluid.heap.Heap;
@@ -161,7 +162,8 @@ protected HeapViewerNode createObjectReferenceNode(RubyObject object, String typ
         }
 
         @Override
-        protected Collection<FieldValue> getPropertyItems(RubyObject object, Heap heap) {
+        protected Collection<FieldValue> getPropertyItems(RubyObject object, Heap heap) throws InterruptedException {
+            HeapOperations.initializeReferences(heap);
             return object.getReferences();
         }
 
