JDK 11 support added

thurka · thurka · commit 1758d037fcac · 2018-08-21T10:59:11.000+02:00
diff --git a/visualvm/application/manifest.mf b/visualvm/application/manifest.mf
@@ -5,5 +5,5 @@ OpenIDE-Module: com.sun.tools.visualvm.application/0
 OpenIDE-Module-Layer: com/sun/tools/visualvm/application/resources/layer.xml
 OpenIDE-Module-Install: com/sun/tools/visualvm/application/Installer.class
 OpenIDE-Module-Localizing-Bundle: com/sun/tools/visualvm/application/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.10
+OpenIDE-Module-Specification-Version: 1.11
 
diff --git a/visualvm/application/src/com/sun/tools/visualvm/application/jvm/DefaultJvm.java b/visualvm/application/src/com/sun/tools/visualvm/application/jvm/DefaultJvm.java
@@ -68,6 +68,10 @@ public boolean is100() {
         return false;
     }
 
+    public boolean is110() {
+        return false;
+    }
+
     public boolean isAttachable() {
         return false;
     }
diff --git a/visualvm/application/src/com/sun/tools/visualvm/application/jvm/Jvm.java b/visualvm/application/src/com/sun/tools/visualvm/application/jvm/Jvm.java
@@ -107,6 +107,17 @@ public boolean is100() {
         return false;
     }
 
+    /**
+     * Tests if target JVM is JRE 11.
+     * @return <CODE>true</CODE> if JVM is JRE 11, <CODE>false</CODE> otherwise
+     *
+     * @since VisualVM 1.4.2
+     */
+    public boolean is110() {
+        // default implementation for backward compatibility
+        return false;
+    }
+    
     /**
      * Tests if VisualVM can attach to target JVM via
      * <a href=http://download.oracle.com/javase/6/docs/technotes/guides/attach/index.html>Attach API</a>.
diff --git a/visualvm/jvm/nbproject/genfiles.properties b/visualvm/jvm/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=84e0b446
+build.xml.data.CRC32=11705818
 build.xml.script.CRC32=25884fdd
 build.xml.stylesheet.CRC32=a56c6a5b@2.73
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=84e0b446
+nbproject/build-impl.xml.data.CRC32=11705818
 nbproject/build-impl.xml.script.CRC32=63c7509b
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.73
diff --git a/visualvm/jvm/nbproject/project.xml b/visualvm/jvm/nbproject/project.xml
@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <specification-version>1.10</specification-version>
+                        <specification-version>1.11</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/jvm/src/com/sun/tools/visualvm/jvm/JVMImpl.java b/visualvm/jvm/src/com/sun/tools/visualvm/jvm/JVMImpl.java
@@ -241,6 +241,14 @@ public boolean is100() {
         return false;
     }
 
+    public boolean is110() {
+        String ver = getJavaVersion();
+        if (ver != null && javaVersion != null && (ver.equals("11") || ver.equals("11-ea") || ver.startsWith("11."))) {    // NOI18N
+            return true;
+        }
+        return false;
+    }
+
     public boolean isDumpOnOOMEnabled() {
         if (isDumpOnOOMEnabled == null) {
             AttachModel attach = getAttach();
diff --git a/visualvm/jvmstat/src/com/sun/tools/visualvm/jvmstat/JvmJvmstatModelProvider.java b/visualvm/jvmstat/src/com/sun/tools/visualvm/jvmstat/JvmJvmstatModelProvider.java
@@ -64,6 +64,10 @@ public JvmJvmstatModel createModelFor(Application app) {
                 // JVM 10
                 else if (javaVersion.equals("10")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
                 else if (javaVersion.startsWith("10.")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
+                // JVM 11
+                else if (javaVersion.equals("11")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
+                else if (javaVersion.equals("11-ea")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
+                else if (javaVersion.startsWith("11.")) model = new JvmJvmstatModel_8(app,jvmstat); // NOI18N
             }
             
             if (model == null) {
diff --git a/visualvm/launcher/visualvm.conf b/visualvm/launcher/visualvm.conf
@@ -58,7 +58,7 @@ visualvm_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/1.4"
 # (can be overridden by explicit command line switches)
 #
 
-visualvm_default_options="-J-client -J-Xms24m -J-Xmx256m -J-Dnetbeans.accept_license_class=com.sun.tools.visualvm.modules.startup.AcceptLicense -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-modules=java.activation -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions"
+visualvm_default_options="-J-client -J-Xms24m -J-Xmx256m -J-Dnetbeans.accept_license_class=com.sun.tools.visualvm.modules.startup.AcceptLicense -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions"
 # for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea
 
 # Default location of JDK:
diff --git a/visualvm/nb90_visualvm_15082018-ml.zip b/visualvm/nb90_visualvm_15082018-ml.zip
diff --git a/visualvm/nb90_visualvm_15082018.zip b/visualvm/nb90_visualvm_15082018.zip
diff --git a/visualvm/profiler/nbproject/genfiles.properties b/visualvm/profiler/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=476375e9
+build.xml.data.CRC32=dd702792
 build.xml.script.CRC32=03a7511e
 build.xml.stylesheet.CRC32=a56c6a5b@2.73
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=476375e9
+nbproject/build-impl.xml.data.CRC32=dd702792
 nbproject/build-impl.xml.script.CRC32=6c1a4403
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.73
diff --git a/visualvm/profiler/nbproject/project.xml b/visualvm/profiler/nbproject/project.xml
@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <specification-version>1.10</specification-version>
+                        <specification-version>1.11</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -65,7 +65,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.54.2</specification-version>
+                        <specification-version>1.111</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/visualvm/profiler/src/com/sun/tools/visualvm/profiler/ProfilerSupport.java b/visualvm/profiler/src/com/sun/tools/visualvm/profiler/ProfilerSupport.java
@@ -81,6 +81,7 @@ public final class ProfilerSupport {
     private static final String JAVA_RT_19_PREFIX = "1.9.0";  // NOI18N
     private static final String JAVA_RT_9_PREFIX = "9";  // NOI18N
     private static final String JAVA_RT_100_PREFIX = "10";  // NOI18N
+    private static final String JAVA_RT_110_PREFIX = "11";  // NOI18N
     
     private static ProfilerSupport instance;
     
@@ -132,6 +133,8 @@ public String[][] getSupportedJavaPlatforms() {
         }
         String code = "jdk100"; // NOI18N
         if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) codesl.add(code);
+        code = "jdk110"; // NOI18N
+        if (supportsProfiling(code, 32) || supportsProfiling(code, 64)) codesl.add(code);
         
         String[] names = new String[codesl.size()];
         String[] codes = new String[codesl.size()];
@@ -176,6 +179,8 @@ static String getJavaName(String code) {
             return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 9); // NOI18N
         if (Platform.JDK_100_STRING.equals(code))
             return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 10); // NOI18N
+        if (Platform.JDK_110_STRING.equals(code))
+            return NbBundle.getMessage(ProfilerSupport.class, "STR_Java_platform_name", 11); // NOI18N
         throw new IllegalArgumentException("Unknown java code " + code); // NOI18N
     }
     
@@ -313,9 +318,8 @@ boolean supportsProfiling(Application application) {
 //////        return false;
 
         // Profiled application needs to be running JDK 6.0 or 7.0 or 8.0 or 9.0
-        // or 10
-        if (!jvm.is16() && !jvm.is17() && !jvm.is18()
-             && !jvm.is19() && !jvm.is100()) return false;
+        // or 10 or 11
+        if (jvm.is14() || jvm.is15()) return false;
         
         String vmName = jvm.getVmName();
         String vmVendor = jvm.getVmVendor();
@@ -371,6 +375,8 @@ static boolean classSharingBreaksProfiling(Application application) {
                 return false;
             } else if (javaRTVersion.startsWith(JAVA_RT_100_PREFIX)) {
                 return false;
+            } else if (javaRTVersion.startsWith(JAVA_RT_110_PREFIX)) {
+                return false;
             }
         // OpenJDK -------------------------------------------------------------
         } else if(vmName.startsWith(OPENJDK_VM_NAME_PREFIX)) {
@@ -398,6 +404,8 @@ else if (javaRTVersion.startsWith(JAVA_RT_18_PREFIX)) {
                 return false;
             } else if (javaRTVersion.startsWith(JAVA_RT_100_PREFIX)) {
                 return false;
+            } else if (javaRTVersion.startsWith(JAVA_RT_110_PREFIX)) {
+                return false;
             }
         }
         
diff --git a/visualvm/startup/src/com/sun/tools/visualvm/modules/startup/Bundle.properties b/visualvm/startup/src/com/sun/tools/visualvm/modules/startup/Bundle.properties
@@ -53,5 +53,5 @@ ACSD_RejectButton=Click to reject license and exit
 OpenIDE-Module-Short-Description=VisualVM startup Module
 
 VisualVMStartup_ErrorStartupCaption=Error Starting VisualVM
-VisualVMStartup_IncorrectVersionMsg=<html><br><b>You are running VisualVM using an unsupported Java version: {0}.</b><br><br>Please use JDK 8 or JDK 9 or JDK 10 to run VisualVM. For information<br>about requirements and setup visit https://visualvm.github.io.<br><br><hr><i>Java: {1}<br>JVM: {2}<br>Location: {3}</i><br><br></html>
+VisualVMStartup_IncorrectVersionMsg=<html><br><b>You are running VisualVM using an unsupported Java version: {0}.</b><br><br>Please use JDK 8 or JDK 9 or JDK 10 or JDK 11 to run VisualVM. For information<br>about requirements and setup visit https://visualvm.github.io.<br><br><hr><i>Java: {1}<br>JVM: {2}<br>Location: {3}</i><br><br></html>
 VisualVMStartup_JreMsg=<html><br><b>You are running VisualVM using Java Runtime Environment (JRE).</b><br><br>Please use Java Development Kit (JDK) to run VisualVM. For information<br>about requirements and setup visit https://visualvm.github.io.<br><br><hr><i>Java: {0}<br>JVM: {1}<br>Location: {2}</i><br><br></html>
diff --git a/visualvm/startup/src/com/sun/tools/visualvm/modules/startup/VisualVMStartup.java b/visualvm/startup/src/com/sun/tools/visualvm/modules/startup/VisualVMStartup.java
@@ -61,8 +61,8 @@ static synchronized boolean checkEnv() {
         if (DISABLE_STARTUP_CHECK) {
             System.err.println("Starting with com.sun.tools.visualvm.modules.startup.DisableStartupCheck=true"); // NOI18N
         } else {
-            if (!isJava8or9or10()) {
-                displayError8or9or10();
+            if (!isJava8or9or10or11()) {
+                displayError8or9or10or11();
                 return false;
             } else if (!isJDK()) {
                 displayErrorJRE();
@@ -73,7 +73,7 @@ static synchronized boolean checkEnv() {
         return true;
     }
     
-    private static void displayError8or9or10() {
+    private static void displayError8or9or10or11() {
         Utils.setSystemLaF();
         JDialog d = StartupDialog.create(ERROR_STARTUP_CAPTION, MessageFormat.format(INCORRECT_VERSION_MSG,
                 new Object[] { System.getProperty("java.specification.version"), getJavaInfo(), // NOI18N
@@ -90,12 +90,13 @@ private static void displayErrorJRE() {
         d.setVisible(true);
     }
     
-    private static boolean isJava8or9or10() {
+    private static boolean isJava8or9or10or11() {
         String javaVersion = System.getProperty("java.specification.version"); // NOI18N
         if (javaVersion == null) return false;
         return javaVersion.startsWith("1.8")  // NOI18N
             || javaVersion.startsWith("1.9") || javaVersion.startsWith("9") // NOI18N
-            || javaVersion.startsWith("10"); // NOI18N
+            || javaVersion.startsWith("10") // NOI18N
+            || javaVersion.startsWith("11"); // NOI18N
     }
     
     private static boolean isJDK() {

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,10 @@ public boolean is100() {`
`68`	`68`	`return false;`
`69`	`69`	`}`
`70`	`70`
	`71`	`+ public boolean is110() {`
	`72`	`+ return false;`
	`73`	`+ }`
	`74`	`+`
`71`	`75`	`public boolean isAttachable() {`
`72`	`76`	`return false;`
`73`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ visualvm_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/1.4"`
`58`	`58`	`# (can be overridden by explicit command line switches)`
`59`	`59`	`#`
`60`	`60`
`61`		-visualvm_default_options="-J-client -J-Xms24m -J-Xmx256m -J-Dnetbeans.accept_license_class=com.sun.tools.visualvm.modules.startup.AcceptLicense -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-modules=java.activation -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions"
	`61`	+visualvm_default_options="-J-client -J-Xms24m -J-Xmx256m -J-Dnetbeans.accept_license_class=com.sun.tools.visualvm.modules.startup.AcceptLicense -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J-Dorg.netbeans.core.TimeableEventQueue.quantum=360000 -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-opens=java.base/java.net=ALL-UNNAMED -J--add-opens=java.base/java.lang.ref=ALL-UNNAMED -J--add-opens=java.base/java.lang=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED -J-XX:+IgnoreUnrecognizedVMOptions"
`62`	`62`	`# for development purposes you may wish to append: -J-Dnetbeans.logger.console=true -J-ea`
`63`	`63`
`64`	`64`	`# Default location of JDK:`