Skip to content

Commit c69a521

Browse files
thurkathurka
committed
JDK 14 support added
1 parent 086e151 commit c69a521

File tree

21 files changed

+63
-18
lines changed

21 files changed

+63
-18
lines changed

‎visualvm/jvmstat/src/org/graalvm/visualvm/jvmstat/JvmJvmstatModelProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ public JvmJvmstatModel createModelFor(Application app) {
6868
else if (isJavaVersion(javaVersion,"12")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
6969
// JVM 13
7070
else if (isJavaVersion(javaVersion,"13")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
71+
// JVM 14
72+
else if (isJavaVersion(javaVersion,"14")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
7173
}
7274

7375
if (model == null) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Manifest-Version: 1.0
22
OpenIDE-Module: org.graalvm.visualvm.lib.common/2
33
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/common/Bundle.properties
4-
OpenIDE-Module-Specification-Version: 2.0
4+
OpenIDE-Module-Specification-Version: 2.1
55
OpenIDE-Module-Needs: org.graalvm.visualvm.lib.common.Profiler
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ made subject to such option by the copyright holder.
5656
<compile-dependency/>
5757
<run-dependency>
5858
<release-version>2</release-version>
59-
<specification-version>2.0</specification-version>
59+
<specification-version>2.0.2</specification-version>
6060
</run-dependency>
6161
</dependency>
6262
<dependency>

‎visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/integration/Bundle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ IntegrationUtils_PlatformJava100=Java SE 10.0
5050
IntegrationUtils_PlatformJava110=Java SE 11
5151
IntegrationUtils_PlatformJava120=Java SE 12
5252
IntegrationUtils_PlatformJava130=Java SE 13
53+
IntegrationUtils_PlatformJava140=Java SE 14
5354
IntegrationUtils_PlatformJavaCvm=CVM
5455
IntegrationUtils_PlatformWindowsOs=Windows, 32bit JVM
5556
IntegrationUtils_PlatformWindowsAmd64Os=Windows, 64bit JVM
@@ -88,6 +89,7 @@ IntegrationUtils_Jdk100Name=Java SE 10 (JRE or JDK)
8889
IntegrationUtils_Jdk110Name=Java SE 11 (JRE or JDK)
8990
IntegrationUtils_Jdk120Name=Java SE 12 (JRE or JDK)
9091
IntegrationUtils_Jdk130Name=Java SE 13 (JRE or JDK)
92+
IntegrationUtils_Jdk140Name=Java SE 14 (JRE or JDK)
9193
IntegrationUtils_JdkCvmName=CVM
9294
IntegrationUtils_RemoteString=remote
9395
# HTML-formatted

‎visualvm/libs.profiler/lib.profiler.common/src/org/graalvm/visualvm/lib/common/integration/IntegrationUtils.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public class IntegrationUtils {
7676
public static final String PLATFORM_JAVA_110 = messages.getString("IntegrationUtils_PlatformJava110"); // NOI18N
7777
public static final String PLATFORM_JAVA_120 = messages.getString("IntegrationUtils_PlatformJava120"); // NOI18N
7878
public static final String PLATFORM_JAVA_130 = messages.getString("IntegrationUtils_PlatformJava130"); // NOI18N
79+
public static final String PLATFORM_JAVA_140 = messages.getString("IntegrationUtils_PlatformJava140"); // NOI18N
7980
public static final String PLATFORM_JAVA_CVM = messages.getString("IntegrationUtils_PlatformJavaCvm"); // NOI18N
8081
public static final String PLATFORM_WINDOWS_OS = messages.getString("IntegrationUtils_PlatformWindowsOs"); // NOI18N
8182
public static final String PLATFORM_WINDOWS_AMD64_OS = messages.getString("IntegrationUtils_PlatformWindowsAmd64Os"); // NOI18N
@@ -107,6 +108,7 @@ public class IntegrationUtils {
107108
private static final String JDK_110_NAME = messages.getString("IntegrationUtils_Jdk110Name"); // NOI18N
108109
private static final String JDK_120_NAME = messages.getString("IntegrationUtils_Jdk120Name"); // NOI18N
109110
private static final String JDK_130_NAME = messages.getString("IntegrationUtils_Jdk130Name"); // NOI18N
111+
private static final String JDK_140_NAME = messages.getString("IntegrationUtils_Jdk140Name"); // NOI18N
110112
private static final String JDK_CVM_NAME = messages.getString("IntegrationUtils_JdkCvmName"); // NOI18N
111113
private static final String HTML_REMOTE_STRING = "&lt;" + messages.getString("IntegrationUtils_RemoteString") + "&gt;"; // NOI18N
112114
private static final String EXPORT_SETENV_MESSAGE = messages.getString("IntegrationUtils_ExportSetenvMessage"); // NOI18N
@@ -357,6 +359,8 @@ public static String getJavaPlatformName(String javaPlatform) {
357359
return JDK_120_NAME;
358360
} else if (javaPlatform.equals(PLATFORM_JAVA_130)) {
359361
return JDK_130_NAME;
362+
} else if (javaPlatform.equals(PLATFORM_JAVA_140)) {
363+
return JDK_140_NAME;
360364
} else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
361365
return JDK_CVM_NAME;
362366
}
@@ -378,6 +382,14 @@ public static String getJavaPlatformNativeLibrariesDirectoryName(String javaPlat
378382
return "jdk16"; //NOI18N // for JDK 9.0 we use the same as for 6.0 for now
379383
} else if (javaPlatform.equals(PLATFORM_JAVA_100)) {
380384
return "jdk16"; //NOI18N // for JDK 10 we use the same as for 6.0 for now
385+
} else if (javaPlatform.equals(PLATFORM_JAVA_110)) {
386+
return "jdk16"; //NOI18N // for JDK 10 we use the same as for 6.0 for now
387+
} else if (javaPlatform.equals(PLATFORM_JAVA_120)) {
388+
return "jdk16"; //NOI18N // for JDK 10 we use the same as for 6.0 for now
389+
} else if (javaPlatform.equals(PLATFORM_JAVA_130)) {
390+
return "jdk16"; //NOI18N // for JDK 10 we use the same as for 6.0 for now
391+
} else if (javaPlatform.equals(PLATFORM_JAVA_140)) {
392+
return "jdk16"; //NOI18N // for JDK 10 we use the same as for 6.0 for now
381393
} else if (javaPlatform.equals(PLATFORM_JAVA_CVM)) {
382394
return "cvm"; // NOI18N
383395
}
@@ -428,6 +440,8 @@ public static String getLocalJavaPlatform() {
428440
return PLATFORM_JAVA_120;
429441
} else if (jdkVersion == Platform.JDK_130) {
430442
return PLATFORM_JAVA_130;
443+
} else if (jdkVersion == Platform.JDK_140) {
444+
return PLATFORM_JAVA_140;
431445
}
432446

433447
return null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Manifest-Version: 1.0
22
OpenIDE-Module: org.graalvm.visualvm.lib.jfluid/2
33
OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/lib/jfluid/Bundle.properties
4-
OpenIDE-Module-Specification-Version: 2.0.1
4+
OpenIDE-Module-Specification-Version: 2.1
55

‎visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/TargetAppRunner.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,9 +705,10 @@ private boolean startTargetVM(String[] jvmArgs, String mainClassName, String[] m
705705
|| jdkVer.equals(JDK_100_STRING)
706706
|| jdkVer.equals(JDK_110_STRING)
707707
|| jdkVer.equals(JDK_120_STRING)
708-
|| jdkVer.equals(JDK_130_STRING)) {
709-
// for now the 1.6 and 1.7 and 1.8 and 9 and 10+ profiling uses the same agent as 1.5
710-
jdkVer = JDK_15_STRING;
708+
|| jdkVer.equals(JDK_130_STRING)
709+
|| jdkVer.equals(JDK_140_STRING)) {
710+
// for now the 1.6 and 1.7 and 1.8 and 9 and 10+ profiling uses the same agent as 1.6
711+
jdkVer = JDK_16_STRING;
711712
}
712713

713714
jdkVer = jdkVer.substring(3); // Convert e.g. "jdk15" into just "15"

‎visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/CommonConstants.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ public interface CommonConstants {
102102
public static final int JDK_110 = 9;
103103
public static final int JDK_120 = 10;
104104
public static final int JDK_130 = 11;
105+
public static final int JDK_140 = 12;
105106
public static final int JDK_CVM = 5;
106107
public static final int JDK_UNSUPPORTED = -1;
107108

@@ -115,6 +116,7 @@ public interface CommonConstants {
115116
public static final String JDK_110_STRING = "jdk110"; // NOI18N
116117
public static final String JDK_120_STRING = "jdk120"; // NOI18N
117118
public static final String JDK_130_STRING = "jdk130"; // NOI18N
119+
public static final String JDK_140_STRING = "jdk140"; // NOI18N
118120
public static final String JDK_CVM_STRING = "cvm"; // NOI18N
119121
public static final String JDK_UNSUPPORTED_STRING = "UNSUPPORTED_JDK"; // NOI18N
120122

‎visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/Platform.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public static String getAgentNativeLibFullName(String fullAgentPath, boolean ful
185185
if (jdkString.equals(JDK_17_STRING) || jdkString.equals(JDK_18_STRING)
186186
|| jdkString.equals(JDK_19_STRING) || jdkString.equals(JDK_100_STRING)
187187
|| jdkString.equals(JDK_110_STRING) || jdkString.equals(JDK_120_STRING)
188-
|| jdkString.equals(JDK_130_STRING)) {
188+
|| jdkString.equals(JDK_130_STRING) || jdkString.equals(JDK_140_STRING)) {
189189
// for now, we use the same libs for 1.6 and 1.7 and 1.8 and 1.9 and 10+
190190
jdkString = JDK_16_STRING;
191191
}
@@ -320,6 +320,8 @@ private static int getJDKVersionNumber(String javaVersion) {
320320
jdkVersion = JDK_120;
321321
} else if (javaVersion.equals("13") || javaVersion.startsWith("13.")) { // NOI18N
322322
jdkVersion = JDK_130;
323+
} else if (javaVersion.equals("14") || javaVersion.startsWith("14.")) { // NOI18N
324+
jdkVersion = JDK_140;
323325
} else if (javaVersion.equals("CVM")) { // NOI18N
324326
jdkVersion = JDK_CVM;
325327
} else {
@@ -358,6 +360,7 @@ public static String getJDKVersionString(String javaVersionString) {
358360
case JDK_110: return JDK_110_STRING;
359361
case JDK_120: return JDK_120_STRING;
360362
case JDK_130: return JDK_130_STRING;
363+
case JDK_140: return JDK_140_STRING;
361364
case JDK_CVM: return JDK_CVM_STRING;
362365
case JDK_UNSUPPORTED: return JDK_UNSUPPORTED_STRING;
363366
}

‎visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/instrumentation/JavaClassConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public interface JavaClassConstants {
5454

5555
/* Class file constants */
5656
public static final int JAVA_MAGIC = 0xCAFEBABE;
57-
public static final int JAVA_MAJOR_VERSION = 57;
57+
public static final int JAVA_MAJOR_VERSION = 58;
5858
public static final int JAVA_MINOR_VERSION = 0;
5959
public static final int JAVA_MIN_MAJOR_VERSION = 45;
6060
public static final int JAVA_MIN_MINOR_VERSION = 3;

0 commit comments

Comments
 (0)