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

Author: jisedlac

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

@@ -363,10 +363,10 @@ protected HeapViewerNode[] lazilyComputeChildren(Heap heap, String viewID, HeapV
                 if ("object".equals(fieldTypeName)) { // NOI18N
                     final InstanceCounter values = new InstanceCounter(instancesCount);
 
-                    progress.setupKnownSteps(instancesCount);
-
-                    Iterator<Instance> instances = instancesIterator();
                     try {
+                        progress.setupKnownSteps(instancesCount);
+
+                        Iterator<Instance> instances = instancesIterator();
                         while (instances.hasNext()) {
                             Instance instance = instances.next();
                             progress.step();
@@ -412,10 +412,10 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
                 } else {
                     final PrimitiveCounter counter = PrimitiveCounter.create(fieldTypeName, instancesCount);
 
-                    progress.setupKnownSteps(instancesCount);
-
-                    Iterator<Instance> instances = instancesIterator();
                     try {
+                        progress.setupKnownSteps(instancesCount);
+
+                        Iterator<Instance> instances = instancesIterator();
                         while (instances.hasNext()) {
                             Instance instance = instances.next();
                             progress.step();

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

@@ -220,11 +220,11 @@ private HeapViewerNode[] computeInstancesReferences(final InstancesWrapper insta
         HeapOperations.initializeReferences(heap);
 
         final Map<Long, Integer> values = new HashMap();
-                
-        progress.setupKnownSteps(instances.getInstancesCount());
+        
+        try {        
+            progress.setupKnownSteps(instances.getInstancesCount());
 
-        InterruptibleIterator<Instance> instancesI = instancesIterator(instances);
-        try {
+            InterruptibleIterator<Instance> instancesI = instancesIterator(instances);
             while (instancesI.hasNext()) {
                 Instance instance = instancesI.next();
                 progress.step();

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

@@ -257,11 +257,10 @@ private static Collection<HeapViewerNode> computeInstanceRoots(Instance instance
             HeapViewerNode firstNode = null;
             ToRoot previousNode = null;
 
-            Thread current = Thread.currentThread();
-            
-            progress.setupUnknownSteps();
-
             try {
+                progress.setupUnknownSteps();
+                
+                Thread current = Thread.currentThread();
                 while (!current.isInterrupted() && instance != nextInstance) {
                     List<Value> references = instance.getReferences();
                     for (Value reference : references) {
@@ -296,11 +295,10 @@ private static Collection<HeapViewerNode> computeInstanceRoots(Instance instance
     private static Collection<HeapViewerNode> computeInstancesRoots(Iterator<Instance> instances, int count, Progress progress) throws InterruptedException {
         Map<Instance, HeapViewerNode> gcRoots = new HashMap();
 
-        Thread current = Thread.currentThread();
-        
-        progress.setupKnownSteps(count);
-        
         try {
+            progress.setupKnownSteps(count);
+            
+            Thread current = Thread.currentThread();
             while (!current.isInterrupted() && instances.hasNext()) {
                 Instance instance = instances.next();
                 Instance gcRoot = getGCRoot(instance, current);

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/oql/OQLQueryExecutor.java

@@ -201,9 +201,9 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
             HeapViewerNode[] nodes = computer.computeNodes(root, heap, viewID, viewFilter, dataTypes, sortOrders, progress);
             return nodes.length == 0 ? new HeapViewerNode[] { new TextNode(Messages.getNoObjectsString(viewFilter)) } : nodes;
         } else {
-            progress.setupUnknownSteps();
-            
             try {
+                progress.setupUnknownSteps();
+                
                 List<InstancesContainer.Objects> cnodes = new ArrayList();
                 Map<String, InstancesContainer.Objects> classes = new HashMap();
                 for (Object object : queryObjects) {

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/utils/MoreObjectsNode.java

@@ -195,9 +195,9 @@ private T[] getObjects(int containerIndex, Heap heap, HeapViewerNodeFilter viewF
 
         T object;
 
-        progress.setupUnknownSteps();
-        
         try {
+            progress.setupUnknownSteps();
+            
             object = getPreviousObject(containerIndex, heap, viewFilter, dataType, sortOrder, progress);
         } finally {
             progress.finish();
@@ -210,9 +210,9 @@ private T[] getObjects(int containerIndex, Heap heap, HeapViewerNodeFilter viewF
 
         T[] objects;
 
-        progress.setupKnownSteps(iteratorObjectsCount);
-        
         try {
+            progress.setupKnownSteps(iteratorObjectsCount);
+            
             Iterator<T> objectsIt = objectsIterator(0, progress);
             while (objectsIt.hasNext()) buffer.add(objectsIt.next());
 
@@ -247,9 +247,9 @@ private HeapViewerNode[] loadChildren(int containerIndex, Progress progress) thr
 
         HeapViewerNode[] nodes;
 
-        progress.setupKnownSteps(end);
-        
         try {
+            progress.setupKnownSteps(end);
+            
             int i = 0;
             nodes = new HeapViewerNode[end - start + 1];
             Iterator<T> objectsIt = objectsIterator(start, progress);
@@ -302,9 +302,9 @@ private HeapViewerNode[] computeSampleChildren(int count, Heap heap, String view
 
         HeapViewerNode[] nodes;
 
-        progress.setupKnownSteps(iteratorObjectsCount);
-        
         try {
+            progress.setupKnownSteps(iteratorObjectsCount);
+            
             int i = 0;
             nodes = new HeapViewerNode[count];
             Iterator<T> objectsIt = objectsIterator(0, progress);

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/utils/NodesComputer.java

@@ -147,10 +147,10 @@ protected String getNodesContainerString(String firstNodeIdx, String lastNodeIdx
                 ObjectsIterator objectsIt;
                 T[] objects;
 
-                if (itemsCount == Integer.MAX_VALUE) progress.setupUnknownSteps();
-                else progress.setupKnownSteps(itemsCount);
-                
                 try {
+                    if (itemsCount == Integer.MAX_VALUE) progress.setupUnknownSteps();
+                    else progress.setupKnownSteps(itemsCount);
+                    
                     objectsIt = objectsIterator(0, 0, -1, viewFilter, heap, progress);
                     while (objectsIt.hasNext()) buffer.add(objectsIt.next());