Make sure an initialized Progress (timer started) is always finished (timer stopped) - guest languages.

Author: jisedlac

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

@@ -133,9 +133,9 @@ private Set<FieldDescriptor> getAllObjectsFields(Progress progress) throws Inter
         Set<FieldDescriptor> allFields = new HashSet();
         Iterator<O> objectsI = objectsIterator();
 
-        progress.setupKnownSteps(objects.getObjectsCount());
-        
         try {
+            progress.setupKnownSteps(objects.getObjectsCount());
+            
             while (objectsI.hasNext()) {
                 progress.step();
 
@@ -210,10 +210,10 @@ protected HeapViewerNode[] lazilyComputeChildren(Heap heap, String viewID, HeapV
             if (fieldType == 0) {
                 final InstanceCounter values = new InstanceCounter(objectsCount());
 
-                progress.setupKnownSteps(objectsCount());
-                
                 Iterator<O> objects = objectsIterator();
                 try {
+                    progress.setupKnownSteps(objectsCount());
+                    
                     while (objects.hasNext()) {
                         O o = objects.next();
                         progress.step();
@@ -274,10 +274,10 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
             } else {
                 final Map<String, Integer> values = new HashMap();
 
-                progress.setupKnownSteps(objectsCount());
-                
                 Iterator<O> objects = objectsIterator();
                 try {
+                    progress.setupKnownSteps(objectsCount());
+                    
                     while (objects.hasNext()) {
                         O o = objects.next();
                         progress.step();

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

@@ -104,8 +104,9 @@ protected HeapViewerNode[] getNodes(HeapViewerNode parent, String viewID, HeapVi
 
         Iterator<O> objectsI = objectsIterator();
 
-        progress.setupKnownSteps(objectsCount());
         try {
+            progress.setupKnownSteps(objectsCount());
+            
             while (objectsI.hasNext()) {
                 O object = objectsI.next();
                 progress.step();

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

@@ -146,9 +146,9 @@ public HeapViewerNode[] getDominators(HeapViewerNode parent, HeapContext context
         List<Instance> searchInstances = heap.getBiggestObjectsByRetainedSize(maxSearchInstances);
         Iterator<Instance> searchInstancesIt = searchInstances.iterator();
 
-        progress.setupKnownSteps(searchInstances.size());
-        
         try {
+            progress.setupKnownSteps(searchInstances.size());
+            
             while (searchInstancesIt.hasNext()) {
                 Instance instance = searchInstancesIt.next();
                 progress.step();
@@ -189,9 +189,9 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
         } else {
             TruffleType.TypesComputer<O, T> tcomputer = new TruffleType.TypesComputer(language, heap);
 
-            progress.setupKnownSteps(dominators.size());
-            
             try {
+                progress.setupKnownSteps(dominators.size());
+                
                 for (Instance dominator : dominators) {
                     progress.step();
                     tcomputer.addObject(language.createObject(dominator));
@@ -235,9 +235,9 @@ public HeapViewerNode[] getGCRoots(HeapViewerNode parent, HeapContext context, S
 
         final List<GCRoot> gcroots = new ArrayList(heap.getGCRoots());
 
-        progress.setupUnknownSteps();
-        
         try {
+            progress.setupUnknownSteps();
+            
             Iterator<GCRoot> gcrootsI = gcroots.iterator();
             while (gcrootsI.hasNext()) {
                 Instance instance = gcrootsI.next().getInstance();
@@ -277,9 +277,9 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
         } else {
             TruffleType.TypesComputer<O, T> tcomputer = new TruffleType.TypesComputer(language, heap);
 
-            progress.setupUnknownSteps();
-            
             try {            
+                progress.setupUnknownSteps();
+                
                 for (GCRoot gcroot : gcroots) {
                     tcomputer.addObject(language.createObject(gcroot.getInstance()));
                     progress.step();