Merge branch 'master' into graal

Author: thurka

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

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualvm.lib.ui/1
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.149
+OpenIDE-Module-Specification-Version: 1.150
 

visualvm/libs.profiler/lib.profiler.ui/nbproject/project.xml

@@ -112,6 +112,7 @@ made subject to such option by the copyright holder.
                 <friend>org.graalvm.visualvm.heapviewer</friend>
                 <friend>org.graalvm.visualvm.heapviewer.console</friend>
                 <friend>org.graalvm.visualvm.heapviewer.truffle</friend>
+                <friend>org.graalvm.visualvm.jfr</friend>
                 <friend>org.graalvm.visualvm.lib.profiler</friend>
                 <friend>org.graalvm.visualvm.lib.profiler.attach</friend>
                 <friend>org.graalvm.visualvm.lib.profiler.commandrunner</friend>

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

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

visualvm/libs.profiler/lib.profiler/nbproject/project.xml

@@ -84,6 +84,7 @@ made subject to such option by the copyright holder.
                 <friend>org.graalvm.visualvm.heapviewer</friend>
                 <friend>org.graalvm.visualvm.heapviewer.console</friend>
                 <friend>org.graalvm.visualvm.heapviewer.truffle</friend>
+                <friend>org.graalvm.visualvm.jfr</friend>
                 <friend>org.graalvm.visualvm.lib.common</friend>
                 <friend>org.graalvm.visualvm.lib.profiler</friend>
                 <friend>org.graalvm.visualvm.lib.profiler.api</friend>

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

@@ -185,18 +185,18 @@ public String toString() {
         }
     }
 
-    static class SampledThreadInfo {
+    public static class SampledThreadInfo {
         private StackTraceElement[] stackTrace;
         private Thread.State state;
         private String threadName;
         private long threadId;
         private long threadCpuTime;
 
-        SampledThreadInfo(String tn, long tid, Thread.State ts, StackTraceElement[] st, InstrumentationFilter filter) {
+        public SampledThreadInfo(String tn, long tid, Thread.State ts, StackTraceElement[] st, InstrumentationFilter filter) {
             this (tn, tid,ts, st, -1, filter);
         }
 
-        SampledThreadInfo(String tn, long tid, Thread.State ts, StackTraceElement[] st, long tct, InstrumentationFilter filter) {
+        public SampledThreadInfo(String tn, long tid, Thread.State ts, StackTraceElement[] st, long tct, InstrumentationFilter filter) {
             threadName = tn;
             threadId = tid;
             state = ts;
@@ -224,7 +224,7 @@ static class SampledThreadInfo {
             }
         }
 
-        SampledThreadInfo(java.lang.management.ThreadInfo info, InstrumentationFilter filter) {
+        public SampledThreadInfo(java.lang.management.ThreadInfo info, InstrumentationFilter filter) {
             this(info.getThreadName(), info.getThreadId(), info.getThreadState(), info.getStackTrace(), filter);
         }
 
@@ -329,7 +329,7 @@ final public void setIgnoredThreads(Set<String> ignoredThreadNames) {
         }
     }
 
-    final void addStacktrace(SampledThreadInfo[] threads, long dumpTimeStamp) throws IllegalStateException {
+    final public void addStacktrace(SampledThreadInfo[] threads, long dumpTimeStamp) throws IllegalStateException {
         long timediff = processDumpTimeStamp(dumpTimeStamp);
 
         if (timediff < 0) return;

visualvm/libs.profiler/profiler.api/manifest.mf

@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.graalvm.visualvm.lib.profiler.api/1
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/profiler/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.52
+OpenIDE-Module-Specification-Version: 1.53
 Netigso-Export-Package: org.graalvm.visualvm.lib.profiler.spi

visualvm/libs.profiler/profiler.api/nbproject/project.xml

@@ -137,6 +137,7 @@ made subject to such option by the copyright holder.
                 <friend>org.graalvm.visualvm.heapviewer</friend>
                 <friend>org.graalvm.visualvm.heapviewer.console</friend>
                 <friend>org.graalvm.visualvm.heapviewer.truffle</friend>
+                <friend>org.graalvm.visualvm.jfr</friend>
                 <friend>org.graalvm.visualvm.lib.profiler</friend>
                 <friend>org.graalvm.visualvm.lib.profiler.attach</friend>
                 <friend>org.graalvm.visualvm.lib.profiler.commandrunner</friend>