Worker threads interruption cleanup

Author: jisedlac

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedFields.java

@@ -93,15 +93,15 @@ abstract class TruffleObjectMergedFields<O extends TruffleObject> {
 
 
     private int objectsCount() { return objects.getObjectsCount(); }
-    private Iterator<O> objectsIterator() { return objects.getObjectsIterator(); }
+    private Iterator<O> objectsIterator() { return new InterruptibleIterator(objects.getObjectsIterator()); }
 
     private HeapViewerNode createObjectNode(O object) {
         return (HeapViewerNode)getLanguage().createObjectNode(object, object.getType(heap));
     }
 
 
     HeapViewerNode[] getNodes(HeapViewerNode parent, String viewID, HeapViewerNodeFilter viewFilter, List<DataType> dataTypes, List<SortOrder> sortOrders, Progress progress) throws InterruptedException {
-        final Set<FieldDescriptor> fields = getAllObjectsFields(objects, progress);
+        final Set<FieldDescriptor> fields = getAllObjectsFields(progress);
         NodesComputer<FieldDescriptor> computer = new NodesComputer<FieldDescriptor>(fields.size(), UIThresholds.MAX_INSTANCE_FIELDS) {
             protected boolean sorts(DataType dataType) {
                 return true;
@@ -127,20 +127,16 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
     }
 
 
-    private Set<FieldDescriptor> getAllObjectsFields(TruffleObjectsWrapper<O> objects, Progress progress) throws InterruptedException {
+    private Set<FieldDescriptor> getAllObjectsFields(Progress progress) throws InterruptedException {
         boolean filtersProperties = filtersFields();
 
         Set<FieldDescriptor> allFields = new HashSet();
-        Iterator<O> objectsI = objects.getObjectsIterator();
-        
-        Thread worker = Thread.currentThread();
+        Iterator<O> objectsI = objectsIterator();
 
         progress.setupKnownSteps(objects.getObjectsCount());
 
         try {
             while (objectsI.hasNext()) {
-                if (worker.isInterrupted()) throw new InterruptedException();
-                
                 progress.step();
 
                 Collection<FieldValue> fields = getFields(objectsI.next());
@@ -153,6 +149,7 @@ private Set<FieldDescriptor> getAllObjectsFields(TruffleObjectsWrapper<O> object
                     }
                 }
             }
+            if (Thread.currentThread().isInterrupted()) throw new InterruptedException();
         } finally {
             progress.finish();
         }
@@ -208,19 +205,16 @@ protected HeapViewerNode[] lazilyComputeChildren(Heap heap, String viewID, HeapV
 
                 progress.setupKnownSteps(objectsCount());
 
-                Thread worker = Thread.currentThread();
-
                 Iterator<O> objects = objectsIterator();
                 try {
                     while (objects.hasNext()) {
-                        if (worker.isInterrupted()) throw new InterruptedException();
-                        
                         O o = objects.next();
                         progress.step();
                         FieldValue value = getValueOfField(o, fieldName);
                         if (value instanceof ObjectFieldValue)
                             values.count(((ObjectFieldValue)value).getInstance());
                     }
+                    if (Thread.currentThread().isInterrupted()) throw new InterruptedException();
                 } finally {
                     progress.finish();
                 }
@@ -275,13 +269,9 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
 
                 progress.setupKnownSteps(objectsCount());
 
-                Thread worker = Thread.currentThread();
-
                 Iterator<O> objects = objectsIterator();
                 try {
                     while (objects.hasNext()) {
-                        if (worker.isInterrupted()) throw new InterruptedException();
-                        
                         O o = objects.next();
                         progress.step();
                         FieldValue value = getValueOfField(o, fieldName);
@@ -292,6 +282,7 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
                             values.put(val, ++count);
                         }
                     }
+                    if (Thread.currentThread().isInterrupted()) throw new InterruptedException();
                 } finally {
                     progress.finish();
                 }

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleObjectMergedReferences.java

@@ -87,7 +87,7 @@ abstract class TruffleObjectMergedReferences<O extends TruffleObject> {
 
 
     private int objectsCount() { return objects.getObjectsCount(); }
-    private Iterator<O> objectsIterator() { return objects.getObjectsIterator(); }
+    private Iterator<O> objectsIterator() { return new InterruptibleIterator(objects.getObjectsIterator()); }
 
     private HeapViewerNode createObjectNode(O object) {
         return (HeapViewerNode)getLanguage().createObjectNode(object, object.getType(heap));
@@ -99,15 +99,11 @@ protected HeapViewerNode[] getNodes(HeapViewerNode parent, String viewID, HeapVi
         final Map<Long, Integer> values = new HashMap();
         FieldValue refFV = null;
 
-        Thread worker = Thread.currentThread();
-
         Iterator<O> objectsI = objectsIterator();
 
         progress.setupKnownSteps(objectsCount());
         try {
             while (objectsI.hasNext()) {
-                if (worker.isInterrupted()) throw new InterruptedException();
-                
                 O object = objectsI.next();
                 progress.step();
                 Collection<FieldValue> references = getReferences(object);
@@ -124,6 +120,7 @@ protected HeapViewerNode[] getNodes(HeapViewerNode parent, String viewID, HeapVi
                     values.put(refererID, ++count);
                 }
             }
+            if (Thread.currentThread().isInterrupted()) throw new InterruptedException();
         } catch (OutOfMemoryError e) {
             return new HeapViewerNode[] { new TextNode(Bundle.TruffleObjectPropertyProvider_OOMEWarning()) };
         } finally {