GH-406 new API for head-less progress

Author: thurka

visualvm/heapviewer/nbproject/project.xml

@@ -29,7 +29,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.1</specification-version>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/HeapFragment.java

@@ -25,12 +25,12 @@
 
 package org.graalvm.visualvm.heapviewer;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import javax.swing.BoundedRangeModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
+import javax.swing.Timer;
 import org.netbeans.api.progress.ProgressHandle;
 import org.graalvm.visualvm.lib.jfluid.heap.Heap;
 import org.graalvm.visualvm.lib.jfluid.heap.HeapProgress;
@@ -67,12 +67,20 @@ public HeapFragment(String id, String name, String description, Heap heap) {
 
 
     public static void setProgress(final ProgressHandle pHandle, final int offset) {
-        final BoundedRangeModel progress = HeapProgress.getProgress();
-        progress.addChangeListener(new ChangeListener() {
-            public void stateChanged(ChangeEvent e) {
-                pHandle.progress(progress.getValue() + offset);
+        final long progressId = HeapProgress.getProgressId();
+        final Timer[] timer = new Timer[1];
+
+        timer[0] = new Timer(1500, new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                int value = HeapProgress.getProgressValue(progressId);
+                if (value>=0) {
+                    pHandle.progress(value + offset);
+                } else {
+                    timer[0].stop();
+                }
             }
         });
+        timer[0].start();
     }
 
 

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

@@ -24,13 +24,13 @@
  */
 package org.graalvm.visualvm.heapviewer.utils;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
-import javax.swing.BoundedRangeModel;
 import javax.swing.SwingUtilities;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
+import javax.swing.Timer;
 import org.graalvm.visualvm.heapviewer.HeapFragment;
 import org.graalvm.visualvm.lib.jfluid.heap.Heap;
 import org.graalvm.visualvm.lib.jfluid.heap.HeapProgress;
@@ -235,18 +235,24 @@ public void run() {
     }
 
     private static void setRetainedSizesProgress(final ProgressHandle pHandle, final int offset, final int workunits) {
-        final BoundedRangeModel progress = HeapProgress.getProgress();
-        progress.addChangeListener(new ChangeListener() {
-            boolean switchedToDeterminate;
+        final long progressId = HeapProgress.getProgressId();
+        final Timer timer[] = new Timer[1];
 
-            @Override
-            public void stateChanged(ChangeEvent e) {
+        timer[0] = new Timer(1500, new ActionListener() {
+            boolean switchedToDeterminate;
+            public void actionPerformed(ActionEvent e) {
                 if (!switchedToDeterminate) {
                     pHandle.switchToDeterminate(workunits);
                     switchedToDeterminate = true;
                 }
-                pHandle.progress(progress.getValue() + offset);
+                int value = HeapProgress.getProgressValue(progressId);
+                if (value>=0) {
+                    pHandle.progress(value + offset);
+                } else {
+                    timer[0].stop();
+                }
             }
         });
+        timer[0].start();
     }
 }

visualvm/libs.profiler/lib.profiler.heap/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualvm.lib.jfluid.heap
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/jfluid/heap/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 

visualvm/libs.profiler/lib.profiler.heap/src/org/graalvm/visualvm/lib/jfluid/heap/HeapProgress.java

@@ -25,9 +25,10 @@
 
 package org.graalvm.visualvm.lib.jfluid.heap;
 
-import javax.swing.BoundedRangeModel;
-import javax.swing.DefaultBoundedRangeModel;
-import javax.swing.SwingUtilities;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicLong;
 
 
 /**
@@ -37,20 +38,30 @@ public final class HeapProgress {
 
     public static final int PROGRESS_MAX = 1000;
     private static ThreadLocal<ModelInfo> progressThreadLocal = new ThreadLocal();
+    private static Map<Long,ModelInfo> progresses = Collections.synchronizedMap(new HashMap<>());
 
     private HeapProgress() {
     }
 
-    public static BoundedRangeModel getProgress() {
+    public static long getProgressId() {
         ModelInfo info = progressThreadLocal.get();
 
         if (info == null) {
             info = new ModelInfo();
             progressThreadLocal.set(info);
+            progresses.put(info.progressId, info);
         }
-        return info.model;
+        return info.progressId;
     }
 
+    public static int getProgressValue(long progressId) {
+        ModelInfo info = progresses.get(progressId);
+        if (info != null) {
+            return info.value;
+        }
+        return -1;
+     }
+
     static void progress(long counter, long startOffset, long value, long endOffset) {
         // keep this method short so that it can be inlined
         if (counter % 100000 == 0) {
@@ -70,7 +81,7 @@ private static void progress(final long value, final long endOffset, final long
             }
             long val = PROGRESS_MAX*(value - startOffset)/(endOffset - startOffset);
             int modelVal = (int) (info.offset + val/info.divider);
-            setValue(info.model, modelVal);
+            info.value = modelVal;
         }
     }
 
@@ -94,29 +105,23 @@ static void progressFinish() {
             assert level >= 0;
             if (level == 0) {
                 progressThreadLocal.remove();
+                progresses.remove(info.progressId);
             }
-            info.offset = info.model.getValue();
-        }
-    }
-    
-    private static void setValue(final BoundedRangeModel model, final int val) {
-        if (SwingUtilities.isEventDispatchThread()) {
-            model.setValue(val);
-        } else {
-            SwingUtilities.invokeLater(new Runnable() {
-                public void run() { model.setValue(val); }
-            });
+            info.offset = info.value;
         }
     }
 
     private static class ModelInfo {
-        private BoundedRangeModel model;
+        private static final AtomicLong PROGRESS_ID = new AtomicLong(0);
+
+        private final long progressId;
         private int level;
         private int divider;
         private int offset;
+        private int value;
 
         private ModelInfo() {
-            model = new DefaultBoundedRangeModel(0,0,0,PROGRESS_MAX);
-        } 
+            progressId = PROGRESS_ID.incrementAndGet();
+        }
     }
 }