Skip to content

Commit 1256c35

Browse files
committed
GH-468 generic JFR loader updated to use JMC version 8.3.0 libraries
1 parent d708063 commit 1256c35

File tree

6 files changed

+19
-20
lines changed

6 files changed

+19
-20
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
E01859D192A9448379DF9F73C063DEC0D9F7CA77 org.openjdk.jmc:flightrecorder:8.2.1
2-
A1FA2C49D87C06124913A1808B646B7EE9B59E91 org.openjdk.jmc:common:8.2.1
1+
E5FA928555ECDE7370C3EB27D7108B5AB78CEE5E org.openjdk.jmc:flightrecorder:8.3.0
2+
161DBC0CB2FC45AF923AD980B879C756F0DEA786 org.openjdk.jmc:common:8.3.0
33
4B986A99445E49EA5FBF5D149C4B63F6ED6C6780 org.lz4:lz4-java:1.8.0
44
35AE93BE1524B161525DA2C9A110019616F67548 org.owasp.encoder:encoder:1.2.3

visualvm/jfr.generic/external/flightrecorder-8.2.1-license.txt renamed to visualvm/jfr.generic/external/flightrecorder-8.3.0-license.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Name: JMC
22
Description: OpenJDK Mission Control, a production time profiling and diagnostics tools suite.
33
License: UPL
44
Origin: https://github.com/openjdk/jmc
5-
Version: 8.2.1
6-
Files: common-8.2.1.jar, flightrecorder-8.2.1.jar
5+
Version: 8.3.0
6+
Files: common-8.3.0.jar, flightrecorder-8.3.0.jar
77

88
Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
99

visualvm/jfr.generic/manifest.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ AutoUpdate-Essential-Module: true
44
OpenIDE-Module: org.graalvm.visualvm.jfr.generic/2
55
OpenIDE-Module-Install: org/graalvm/visualvm/jfr/generic/Installer.class
66
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/jfr/generic/Bundle.properties
7-
OpenIDE-Module-Specification-Version: 2.3
7+
OpenIDE-Module-Specification-Version: 2.4
88
OpenIDE-Module-Provides: jfr.implementation

visualvm/jfr.generic/nbproject/project.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ nbm.homepage=https://visualvm.github.io
66
nbm.module.author=Jiri Sedlacek
77
nbm.needs.restart=true
88
module.javadoc.packages=org.graalvm.visualvm.jfr.generic.*
9-
file.reference.flightrecorder-8.2.1.jar=external/flightrecorder-8.2.1.jar
10-
file.reference.common-8.2.1.jar=external/common-8.2.1.jar
11-
file.reference.lz4-java-1.8.0.jar=external/lz4-java-1.8.0.jar
12-
file.reference.encoder-1.2.3.jar=external/encoder-1.2.3.jar
13-
release.external/flightrecorder-8.2.1.jar=modules/ext/flightrecorder-8.2.1.jar
14-
release.external/common-8.2.1.jar=modules/ext/common-8.2.1.jar
9+
file.reference.flightrecorder.jar=external/flightrecorder-8.3.0.jar
10+
file.reference.common.jar=external/common-8.3.0.jar
11+
file.reference.lz4-java.jar=external/lz4-java-1.8.0.jar
12+
file.reference.encoder.jar=external/encoder-1.2.3.jar
13+
release.external/flightrecorder-8.3.0.jar=modules/ext/flightrecorder-8.3.0.jar
14+
release.external/common-8.3.0.jar=modules/ext/common-8.3.0.jar
1515
release.external/lz4-java-1.8.0.jar=modules/ext/lz4-java-1.8.0.jar
1616
release.external/encoder-1.2.3.jar=modules/ext/encoder-1.2.3.jar

visualvm/jfr.generic/nbproject/project.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
</module-dependencies>
4444
<public-packages/>
4545
<class-path-extension>
46-
<runtime-relative-path>ext/common-8.2.1.jar</runtime-relative-path>
47-
<binary-origin>external/common-8.2.1.jar</binary-origin>
46+
<runtime-relative-path>ext/common-8.3.0.jar</runtime-relative-path>
47+
<binary-origin>external/common-8.3.0.jar</binary-origin>
4848
</class-path-extension>
4949
<class-path-extension>
50-
<runtime-relative-path>ext/flightrecorder-8.2.1.jar</runtime-relative-path>
51-
<binary-origin>external/flightrecorder-8.2.1.jar</binary-origin>
50+
<runtime-relative-path>ext/flightrecorder-8.3.0.jar</runtime-relative-path>
51+
<binary-origin>external/flightrecorder-8.3.0.jar</binary-origin>
5252
</class-path-extension>
5353
<class-path-extension>
5454
<runtime-relative-path>ext/lz4-java-1.8.0.jar</runtime-relative-path>

visualvm/jfr.generic/src/org/graalvm/visualvm/jfr/generic/model/impl/JFRGenericStackFrame.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,11 @@ public int getBCI() {
6161

6262
@Override
6363
public String getType() {
64-
switch (stackFrame.getType()) {
65-
case JIT_COMPILED: return "JIT compiled"; // NOI18
66-
case INTERPRETED: return "Interpreted"; // NOI18
67-
case INLINED: return "Inlined"; // NOI18
68-
default: return "Native"; // NOI18N // ??
64+
IMCFrame.Type type = stackFrame.getType();
65+
if (type.isUnknown()) {
66+
return "Native"; // NOI18N // ??
6967
}
68+
return type.getName();
7069
}
7170

7271

0 commit comments

Comments
 (0)