Merge branch 'master' into graal

Author: thurka

visualvm/host/src/org/graalvm/visualvm/host/model/HostOverview.java

@@ -28,7 +28,7 @@
 import org.graalvm.visualvm.core.model.Model;
 
 /**
- * This class uses available JVM APIs to obtatin various information about operating system and host
+ * This class uses available JVM APIs to obtain various information about operating system and host
  * on which the Java virtual machine is running.
  *
  * @author Tomas Hurka

visualvm/host/src/org/graalvm/visualvm/host/model/LocalHostOverview.java

@@ -31,7 +31,6 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import org.openide.util.NbBundle;
-import org.openide.util.Utilities;
 
 
 /**

visualvm/libs.profiler/lib.profiler.ui/test/unit/src/org/netbeans/lib/profiler/ui/SwingWorkerTest.java renamed to visualvm/libs.profiler/lib.profiler.ui/test/unit/src/org/graalvm/visualvm/lib/ui/SwingWorkerTest.java

@@ -93,15 +93,25 @@ class ClassDump extends HprofObject implements JavaClass {
     //~ Methods ------------------------------------------------------------------------------------------------------------------
 
     public long getAllInstancesSize() {
-        if (isArray()) {
-            return ((Long) classDumpSegment.arrayMap.get(this)).longValue();
+        Long allInstancesSizeArr = (Long) classDumpSegment.arrayMap.get(this);
+
+        if (allInstancesSizeArr != null) {
+            return allInstancesSizeArr.longValue();
         }
 
         return ((long)getInstancesCount()) * getInstanceSize();
     }
 
     public boolean isArray() {
-        return classDumpSegment.arrayMap.get(this) != null;
+        boolean isArrayWithInstances = classDumpSegment.arrayMap.get(this) != null;;
+
+        if (isArrayWithInstances) {
+            return true;
+        }
+        if (instances != 0) {
+            return false;
+        }
+        return getName().endsWith("[]");
     }
 
     public Instance getClassLoader() {

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

@@ -160,9 +160,7 @@ public CPUCCTContainer[] createPresentationCCTs(CPUResultsSnapshot cpuSnapshot)
 
                 // Fix the problem with inconsistent thread times that otherwise will occur for e.g. threads sitting in wait()
                 // for long enough time when "get results" is pressed
-                /* not in use any longer
-                   ti.applyDiffAtGetResultsMoment();
-                 */
+                applyDiffAtGetResultsMoment(ti);
                 double[] activeTimes = calculateThreadActiveTimes(ti);
 
                 TimedCPUCCTNode rootNode = ti.stack[0];
@@ -173,6 +171,7 @@ public CPUCCTContainer[] createPresentationCCTs(CPUResultsSnapshot cpuSnapshot)
                 if ((cct.rootNode != null) && (cct.rootNode.getNChildren() > 0)) {
                     ccts.add(cct);
                 }
+                undoDiffAtGetResultsMoment(ti);
             }
 
             return (CPUCCTContainer[]) ccts.toArray(new CPUCCTContainer[0]);
@@ -189,6 +188,17 @@ protected boolean isCollectingTwoTimeStamps() {
         return status.collectingTwoTimeStamps();
     }
 
+    /** See the comment to ThreadInfo.diffAtGetResultsMoment field. */
+    protected void applyDiffAtGetResultsMoment(ThreadInfo ti) {
+    }
+
+    /**
+     * See the comment to ThreadInfo.diffAtGetResultsMoment field. When we resume data processing for the given thread,
+     * we need to undo the effect of applyDiffAtGetResultsMoment.
+     */
+    protected void undoDiffAtGetResultsMoment(ThreadInfo ti) {
+    }
+
     protected long getDumpAbsTimeStamp() {
         return status.dumpAbsTimeStamp;
     }

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/CPUCallGraphBuilder.java

@@ -57,6 +57,8 @@
 import org.graalvm.visualvm.lib.jfluid.global.CommonConstants;
 import org.graalvm.visualvm.lib.jfluid.global.ProfilingSessionStatus;
 import org.graalvm.visualvm.lib.jfluid.results.RuntimeCCTNode;
+import org.graalvm.visualvm.lib.jfluid.results.cpu.cct.nodes.MethodCPUCCTNode;
+import org.graalvm.visualvm.lib.jfluid.results.cpu.cct.nodes.TimedCPUCCTNode;
 
 /**
  *
@@ -657,7 +659,6 @@ public final CPUResultsSnapshot createSnapshot(
                 instrMethodSigs[counter] = "";
                 counter++;
             }
-            addStacktrace(new java.lang.management.ThreadInfo[0], currentDumpTimeStamp+1);
             return new CPUResultsSnapshot(since, System.currentTimeMillis(), ccgb, ccgb.isCollectingTwoTimeStamps(), instrMethodClasses, instrMethodNames, instrMethodSigs, miCount);
         }
     }
@@ -721,6 +722,36 @@ protected long getDumpAbsTimeStamp() {
             }
         }
 
-    }
+        @Override
+        protected void applyDiffAtGetResultsMoment(ThreadInfo ti) {
+            long time0 = getDumpAbsTimeStamp();
+            long diff = time0 - ti.topMethodEntryTime0;
+
+            applyDiffToTopNode(ti, diff);
+            ti.diffAtGetResultsMoment = diff;
+        }
+
+        @Override
+        protected void undoDiffAtGetResultsMoment(ThreadInfo ti) {
+            applyDiffToTopNode(ti, -ti.diffAtGetResultsMoment);
+            ti.diffAtGetResultsMoment = 0;
+        }
+
+        private void applyDiffToTopNode(ThreadInfo ti, long diff) {
+            if (diff>0) {
+                TimedCPUCCTNode top = ti.peek();
 
+                if (top instanceof MethodCPUCCTNode) {
+                    top.addNetTime0(diff);
+                    if (isCollectingTwoTimeStamps()) {
+                        SampledThreadInfo sti = lastStackTrace.get().get(Long.valueOf(ti.threadId));
+
+                        if (sti!=null && sti.getThreadState() == Thread.State.RUNNABLE) {
+                            top.addNetTime1(diff);
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/StackTraceSnapshotBuilder.java

@@ -50,9 +50,9 @@ public class ThreadInfo {
     // moment user hits "get results" and the timestamp for the method entry into the top stack method. To present
     // results consistenly, we add this value to the TimedCPUCCTNode for the top-stack method. However, when
     // processing of data is resumed, we need to subtract this value back from that node.
-    // this is effectively the self time for the last invocation of the top method on stack - if we would not keep
+    // This is effectively the self time for the last invocation of the top method on stack - if we would not keep
     // it separately, it would not be reported
-    // private long diffAtGetResultsMoment; // diff between last methodEntry and current moment timestamp -
+    long diffAtGetResultsMoment; // diff between last methodEntry and current moment timestamp -
     //  we will have to compensate for the processing time
 
     //~ Instance fields ------------------------------------------------------------------------------------------------------