Merge branch 'master' into graal

Author: thurka

visualvm/application/manifest.mf

@@ -5,5 +5,5 @@ OpenIDE-Module: org.graalvm.visualvm.application/0
 OpenIDE-Module-Layer: org/graalvm/visualvm/application/resources/layer.xml
 OpenIDE-Module-Install: org/graalvm/visualvm/application/Installer.class
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/application/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.12
+OpenIDE-Module-Specification-Version: 1.13
 

visualvm/application/src/org/graalvm/visualvm/application/jvm/Jvm.java

@@ -355,6 +355,23 @@ public HeapHistogram takeHeapHistogram() {
         return null;        
     }
 
+    /**
+     * Returns the number of processors available to the Java virtual machine.
+     *
+     * <p> This value may change during a particular invocation of the virtual
+     * machine.  Applications that are sensitive to the number of available
+     * processors should therefore occasionally poll this property and adjust
+     * their resource usage appropriately. </p>
+     *
+     * @return  the maximum number of processors available to the virtual
+     *          machine; never smaller than one
+     * @since VisualVM 2.0
+     */
+    public int getAvailableProcessors() {
+        // default implementation
+        return 1;
+    }
+
     /**
      * provides access to current values of monitored data in instance of {@link MonitoredData}. 
      * The methods may return <CODE>null</CODE> if the {@link MonitoredData} are not available

visualvm/applicationviews/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <specification-version>1.7</specification-version>
+                        <specification-version>1.13</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

visualvm/applicationviews/src/org/graalvm/visualvm/application/views/monitor/ApplicationMonitorModel.java

@@ -463,6 +463,7 @@ private void initialize(Application application) {
                 heapName = names[0];
                 permgenName = names[1];
             }
+            processorsCount = jvm.getAvailableProcessors();
         }
 
         memoryMXBean = null;
@@ -471,8 +472,6 @@ private void initialize(Application application) {
             JvmMXBeans mxbeans = JvmMXBeansFactory.getJvmMXBeans(jmxModel);
             if (mxbeans != null) {
                 memoryMXBean = mxbeans.getMemoryMXBean();
-                OperatingSystemMXBean osbean = mxbeans.getOperatingSystemMXBean();
-                if (osbean != null) processorsCount = osbean.getAvailableProcessors();
             }
         }
 

visualvm/jvm/nbproject/project.xml

@@ -12,7 +12,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>0</release-version>
-                        <specification-version>1.11</specification-version>
+                        <specification-version>1.13</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

visualvm/jvm/src/org/graalvm/visualvm/jvm/JVMImpl.java

@@ -492,6 +492,16 @@ public boolean isCollectionTimeSupported() {
         return gcList != null && !gcList.isEmpty();
     }
 
+    @Override
+    public int getAvailableProcessors() {
+        int processors = jmxSupport.getAvailableProcessors();
+
+        if (processors != -1) {
+            return processors;
+        }
+        return super.getAvailableProcessors();
+    }
+
     public MonitoredData getMonitoredData() {     
         if (application.getState() == Stateful.STATE_AVAILABLE) {
             if (monitoredVm != null) {

visualvm/jvm/src/org/graalvm/visualvm/jvm/JmxSupport.java

@@ -152,6 +152,14 @@ long getProcessCPUTime() {
         return -1;
     }
 
+    int getAvailableProcessors() {
+        JvmMXBeans jmx = getJvmMXBeans();
+        if (jmx != null) {
+            return jmx.getOperatingSystemMXBean().getAvailableProcessors();
+        }
+        return -1;
+    }
+
     synchronized JvmMXBeans getJvmMXBeans() {
         if (mxbeans == null) {
             JmxModel jmxModel = JmxModelFactory.getJmxModelFor(application);