Provide feedback when computing merged fields/references

Author: jisedlac

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaFieldsPlugin.java

@@ -516,15 +516,17 @@ public boolean isLeaf() {
                         }
                     };
                 }
-                protected ProgressIterator<Instance> objectsIterator(int index, Progress progress) {
+                protected ProgressIterator<Instance> objectsIterator(int index, final Progress _progress) {
+                    _progress.setupUnknownSteps();
                     Iterator<Instance> fieldInstanceIterator = new ExcludingIterator<Instance>(instancesIterator()) {
                         @Override
                         protected boolean exclude(Instance instance) {
+                            _progress.step();
                             FieldValue value = getValueOfField(instance, fieldName);
                             return value == null || !fieldValue.equals(value.getValue());
                         }
                     };
-                    return new ProgressIterator(fieldInstanceIterator, index, true, progress);
+                    return new ProgressIterator(fieldInstanceIterator, index, true, _progress);
                 }
                 protected String getMoreNodesString(String moreNodesCount)  {
                     return Bundle.JavaFieldsPlugin_FieldHistogramMoreNodes(moreNodesCount);
@@ -622,17 +624,19 @@ public boolean isLeaf() {
                         }
                     };
                 }
-                protected ProgressIterator<Instance> objectsIterator(int index, Progress progress) {
+                protected ProgressIterator<Instance> objectsIterator(int index, final Progress _progress) {
                     final Instance _instance = getInstance();
+                    _progress.setupUnknownSteps();
                     Iterator<Instance> fieldInstanceIterator = new ExcludingIterator<Instance>(instancesIterator()) {
                         @Override
                         protected boolean exclude(Instance instance) {
+                            _progress.step();
                             FieldValue value = getValueOfField(instance, fieldName);
                             if (!(value instanceof ObjectFieldValue)) return true;
                             return !Objects.equals(_instance, ((ObjectFieldValue)value).getInstance());
                         }
                     };
-                    return new ProgressIterator(fieldInstanceIterator, index, true, progress);
+                    return new ProgressIterator(fieldInstanceIterator, index, true, _progress);
                 }
                 protected String getMoreNodesString(String moreNodesCount)  {
                     return Bundle.JavaFieldsPlugin_FieldHistogramMoreNodes(moreNodesCount);

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaReferencesPlugin.java

@@ -322,11 +322,13 @@ protected HeapViewerNode createNode(Instance object) {
                         Instance getReferer() { return ReferenceNode.this.getInstance(); }
                     };
                 }
-                protected ProgressIterator<Instance> objectsIterator(int index, Progress _progress) {
+                protected ProgressIterator<Instance> objectsIterator(int index, final Progress _progress) {
                     final Instance _instance = getInstance();
+                    _progress.setupUnknownSteps();
                     Iterator<Instance> fieldInstanceIterator = new ExcludingIterator<Instance>(instancesIterator()) {
                         @Override
                         protected boolean exclude(Instance instance) {
+                            _progress.step();
                             List<Value> references = instance.getReferences();
                             if (_instance == null) return !references.isEmpty();
                             for (Value reference : references)