Merge branch 'master' into graal

thurka · thurka · commit 6711dcf38133 · 2019-04-09T15:51:20.000+02:00
diff --git a/visualvm/libs.profiler/lib.profiler.ui/manifest.mf b/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
 
diff --git a/visualvm/libs.profiler/lib.profiler.ui/nbproject/project.xml b/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>
diff --git a/visualvm/libs.profiler/lib.profiler/manifest.mf b/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
 
diff --git a/visualvm/libs.profiler/lib.profiler/nbproject/project.xml b/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>
diff --git a/visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/results/cpu/StackTraceSnapshotBuilder.java b/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;
diff --git a/visualvm/libs.profiler/profiler.api/manifest.mf b/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
diff --git a/visualvm/libs.profiler/profiler.api/nbproject/project.xml b/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>

Original file line number	Diff line number	Diff line change
`@@ -185,18 +185,18 @@ public String toString() {`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`
`188`		`- static class SampledThreadInfo {`
	`188`	`+ public static class SampledThreadInfo {`
`189`	`189`	`private StackTraceElement[] stackTrace;`
`190`	`190`	`private Thread.State state;`
`191`	`191`	`private String threadName;`
`192`	`192`	`private long threadId;`
`193`	`193`	`private long threadCpuTime;`
`194`	`194`
`195`		`- SampledThreadInfo(String tn, long tid, Thread.State ts, StackTraceElement[] st, InstrumentationFilter filter) {`
	`195`	`+ public SampledThreadInfo(String tn, long tid, Thread.State ts, StackTraceElement[] st, InstrumentationFilter filter) {`
`196`	`196`	`this (tn, tid,ts, st, -1, filter);`
`197`	`197`	`}`
`198`	`198`
`199`		`- SampledThreadInfo(String tn, long tid, Thread.State ts, StackTraceElement[] st, long tct, InstrumentationFilter filter) {`
	`199`	`+ public SampledThreadInfo(String tn, long tid, Thread.State ts, StackTraceElement[] st, long tct, InstrumentationFilter filter) {`
`200`	`200`	`threadName = tn;`
`201`	`201`	`threadId = tid;`
`202`	`202`	`state = ts;`
`@@ -224,7 +224,7 @@ static class SampledThreadInfo {`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`
`227`		`- SampledThreadInfo(java.lang.management.ThreadInfo info, InstrumentationFilter filter) {`
	`227`	`+ public SampledThreadInfo(java.lang.management.ThreadInfo info, InstrumentationFilter filter) {`
`228`	`228`	`this(info.getThreadName(), info.getThreadId(), info.getThreadState(), info.getStackTrace(), filter);`
`229`	`229`	`}`
`230`	`230`
`@@ -329,7 +329,7 @@ final public void setIgnoredThreads(Set<String> ignoredThreadNames) {`
`329`	`329`	`}`
`330`	`330`	`}`
`331`	`331`
`332`		`- final void addStacktrace(SampledThreadInfo[] threads, long dumpTimeStamp) throws IllegalStateException {`
	`332`	`+ final public void addStacktrace(SampledThreadInfo[] threads, long dumpTimeStamp) throws IllegalStateException {`
`333`	`333`	`long timediff = processDumpTimeStamp(dumpTimeStamp);`
`334`	`334`
`335`	`335`	`if (timediff < 0) return;`